toon-members
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Toon-members] tag Makefile.am Makefile.in libtool src/five_po...


From: Gerhard Reitmayr
Subject: [Toon-members] tag Makefile.am Makefile.in libtool src/five_po...
Date: Wed, 22 Apr 2009 19:59:37 +0000

CVSROOT:        /cvsroot/toon
Module name:    tag
Changes by:     Gerhard Reitmayr <gerhard>      09/04/22 19:59:37

Modified files:
        .              : Makefile.am Makefile.in libtool 
        src            : five_point.cpp 
        tag            : helpers.h 

Log message:
        tag five point hacking

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/Makefile.am?cvsroot=toon&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/tag/Makefile.in?cvsroot=toon&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/tag/libtool?cvsroot=toon&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/tag/src/five_point.cpp?cvsroot=toon&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/tag/tag/helpers.h?cvsroot=toon&r1=1.2&r2=1.3

Patches:
Index: Makefile.am
===================================================================
RCS file: /cvsroot/toon/tag/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile.am 20 Apr 2009 10:02:34 -0000      1.11
+++ Makefile.am 22 Apr 2009 19:59:36 -0000      1.12
@@ -2,7 +2,7 @@
 
 lib_LTLIBRARIES     = libtoontag.la
 libtoontag_la_SOURCES   = src/quartic.cpp src/threepointpose.cpp 
src/absorient.cpp \
-                          src/handeye.cpp
+                          src/handeye.cpp src/five_point.cpp 
src/five_point_buildmatrix.cpp src/plrt.c
 
 # the header files to be installed
 pkginclude_HEADERS  = \
@@ -23,7 +23,8 @@
        tag/intersection.h \
        tag/helpers.h \
        tag/unscented.h \
-       tag/handeye.h
+       tag/handeye.h \
+       tag/five_point.h
 
 docs:
        doxygen Doxyfile

Index: Makefile.in
===================================================================
RCS file: /cvsroot/toon/tag/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Makefile.in 20 Apr 2009 10:02:34 -0000      1.11
+++ Makefile.in 22 Apr 2009 19:59:36 -0000      1.12
@@ -59,11 +59,20 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libtoontag_la_LIBADD =
 am_libtoontag_la_OBJECTS = quartic.lo threepointpose.lo absorient.lo \
-       handeye.lo
+       handeye.lo five_point.lo five_point_buildmatrix.lo plrt.lo
 libtoontag_la_OBJECTS = $(am_libtoontag_la_OBJECTS)
 DEFAULT_INCLUDES = address@hidden@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+       --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -198,7 +207,7 @@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libtoontag.la
 libtoontag_la_SOURCES = src/quartic.cpp src/threepointpose.cpp 
src/absorient.cpp \
-                          src/handeye.cpp
+                          src/handeye.cpp src/five_point.cpp 
src/five_point_buildmatrix.cpp src/plrt.c
 
 
 # the header files to be installed
@@ -220,12 +229,13 @@
        tag/intersection.h \
        tag/helpers.h \
        tag/unscented.h \
-       tag/handeye.h
+       tag/handeye.h \
+       tag/five_point.h
 
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 am--refresh:
        @:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -296,10 +306,41 @@
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 @AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
 
+.c.o:
address@hidden@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
address@hidden@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
address@hidden@@am__fastdepCC_FALSE@    source='$<' object='$@' libtool=no 
@AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(COMPILE) -c $<
+
+.c.obj:
address@hidden@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ 
`$(CYGPATH_W) '$<'`
address@hidden@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
address@hidden@@am__fastdepCC_FALSE@    source='$<' object='$@' libtool=no 
@AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
address@hidden@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
address@hidden@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
address@hidden@@am__fastdepCC_FALSE@    source='$<' object='$@' libtool=yes 
@AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(LTCOMPILE) -c -o $@ $<
+
+plrt.lo: src/plrt.c
address@hidden@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT plrt.lo -MD -MP -MF $(DEPDIR)/plrt.Tpo 
-c -o plrt.lo `test -f 'src/plrt.c' || echo '$(srcdir)/'`src/plrt.c
address@hidden@ mv -f $(DEPDIR)/plrt.Tpo $(DEPDIR)/plrt.Plo
address@hidden@@am__fastdepCC_FALSE@    source='src/plrt.c' object='plrt.lo' 
libtool=yes @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o plrt.lo `test -f 'src/plrt.c' || echo 
'$(srcdir)/'`src/plrt.c
+
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o 
$@ $<
 @am__fastdepCXX_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -349,6 +390,20 @@
 @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) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o handeye.lo `test -f 
'src/handeye.cpp' || echo '$(srcdir)/'`src/handeye.cpp
 
+five_point.lo: src/five_point.cpp
address@hidden@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT five_point.lo -MD -MP -MF 
$(DEPDIR)/five_point.Tpo -c -o five_point.lo `test -f 'src/five_point.cpp' || 
echo '$(srcdir)/'`src/five_point.cpp
address@hidden@ mv -f $(DEPDIR)/five_point.Tpo $(DEPDIR)/five_point.Plo
address@hidden@@am__fastdepCXX_FALSE@   source='src/five_point.cpp' 
object='five_point.lo' libtool=yes @AMDEPBACKSLASH@
address@hidden@@am__fastdepCXX_FALSE@   DEPDIR=$(DEPDIR) $(CXXDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o five_point.lo `test -f 
'src/five_point.cpp' || echo '$(srcdir)/'`src/five_point.cpp
+
+five_point_buildmatrix.lo: src/five_point_buildmatrix.cpp
address@hidden@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT five_point_buildmatrix.lo -MD -MP 
-MF $(DEPDIR)/five_point_buildmatrix.Tpo -c -o five_point_buildmatrix.lo `test 
-f 'src/five_point_buildmatrix.cpp' || echo 
'$(srcdir)/'`src/five_point_buildmatrix.cpp
address@hidden@ mv -f $(DEPDIR)/five_point_buildmatrix.Tpo 
$(DEPDIR)/five_point_buildmatrix.Plo
address@hidden@@am__fastdepCXX_FALSE@   source='src/five_point_buildmatrix.cpp' 
object='five_point_buildmatrix.lo' libtool=yes @AMDEPBACKSLASH@
address@hidden@@am__fastdepCXX_FALSE@   DEPDIR=$(DEPDIR) $(CXXDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o five_point_buildmatrix.lo `test -f 
'src/five_point_buildmatrix.cpp' || echo 
'$(srcdir)/'`src/five_point_buildmatrix.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 

Index: libtool
===================================================================
RCS file: /cvsroot/toon/tag/libtool,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libtool     22 Apr 2009 17:05:25 -0000      1.15
+++ libtool     22 Apr 2009 19:59:36 -0000      1.16
@@ -44,11 +44,7 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
-<<<<<<< libtool
-# Libtool was configured on host tove:
-=======
 # Libtool was configured on host pirx.eng.cam.ac.uk:
->>>>>>> 1.14
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -70,23 +66,13 @@
 
 # The host system.
 host_alias=
-<<<<<<< libtool
-host=i686-suse-linux
-host_os=linux
-=======
 host=i686-apple-darwin9.6.0
 host_os=darwin9.6.0
->>>>>>> 1.14
 
 # The build system.
 build_alias=
-<<<<<<< libtool
-build=i686-suse-linux
-build_os=linux
-=======
 build=i686-apple-darwin9.6.0
 build_os=darwin9.6.0
->>>>>>> 1.14
 
 # An echo program that does not interpret backslashes.
 echo="/bin/echo"
@@ -111,11 +97,7 @@
 EGREP="/usr/bin/grep -E"
 
 # The linker used to build libraries.
-<<<<<<< libtool
-LD="/usr/i586-suse-linux/bin/ld"
-=======
 LD="/usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld"
->>>>>>> 1.14
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -340,18 +322,10 @@
 link_all_deplibs=yes
 
 # Compile-time system search path for libraries
-<<<<<<< libtool
-sys_lib_search_path_spec="/usr/lib/gcc/i586-suse-linux/4.3 
/usr/i586-suse-linux/lib /usr/lib /lib"
-=======
 sys_lib_search_path_spec="/usr/lib/i686-apple-darwin9/4.0.1 /usr/lib 
/usr/lib/gcc/i686-apple-darwin9/4.0.1 /usr/local/lib"
->>>>>>> 1.14
 
 # Run-time system search path for libraries
-<<<<<<< libtool
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib/Xaw3d /usr/X11R6/lib 
/usr/lib/Xaw3d /usr/i386-suse-linux/lib /usr/local/lib /opt/kde3/lib 
/usr/i486-linux-libc5/lib/BORKBORKBORK "
-=======
 sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
->>>>>>> 1.14
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -6835,11 +6809,7 @@
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-<<<<<<< libtool
-# Libtool was configured on host tove:
-=======
 # Libtool was configured on host pirx.eng.cam.ac.uk:
->>>>>>> 1.14
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -6861,23 +6831,13 @@
 
 # The host system.
 host_alias=
-<<<<<<< libtool
-host=i686-suse-linux
-host_os=linux
-=======
 host=i686-apple-darwin9.6.0
 host_os=darwin9.6.0
->>>>>>> 1.14
 
 # The build system.
 build_alias=
-<<<<<<< libtool
-build=i686-suse-linux
-build_os=linux
-=======
 build=i686-apple-darwin9.6.0
 build_os=darwin9.6.0
->>>>>>> 1.14
 
 # An echo program that does not interpret backslashes.
 echo="/bin/echo"
@@ -6902,11 +6862,7 @@
 EGREP="/usr/bin/grep -E"
 
 # The linker used to build libraries.
-<<<<<<< libtool
-LD="/usr/i586-suse-linux/bin/ld"
-=======
 LD="/usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld"
->>>>>>> 1.14
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -7030,321 +6986,8 @@
 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}"
 
 # Commands to strip libraries.
-<<<<<<< libtool
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects="/usr/lib/gcc/i586-suse-linux/4.3/../../../crti.o 
/usr/lib/gcc/i586-suse-linux/4.3/crtbeginS.o"
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects="/usr/lib/gcc/i586-suse-linux/4.3/crtendS.o 
/usr/lib/gcc/i586-suse-linux/4.3/../../../crtn.o"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/i586-suse-linux/4.3 
-L/usr/lib/gcc/i586-suse-linux/4.3 
-L/usr/lib/gcc/i586-suse-linux/4.3/../../../../i586-suse-linux/lib 
-L/usr/lib/gcc/i586-suse-linux/4.3/../../.."
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[  ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[       
][      ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  
{\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  
{\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# 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=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# 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=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX 
COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib/gcc/i586-suse-linux/4.3 
/usr/i586-suse-linux/lib /usr/lib /lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib/Xaw3d /usr/X11R6/lib 
/usr/lib/Xaw3d /usr/i386-suse-linux/lib /usr/local/lib /opt/kde3/lib 
/usr/i486-linux-libc5/lib/BORKBORKBORK "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | 
\$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=""
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: CXX
-
-# ### BEGIN LIBTOOL TAG CONFIG: F77
-
-# Libtool was configured on host tove:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-suse-linux
-host_os=linux
-
-# The build system.
-build_alias=
-build=i686-suse-linux
-build_os=linux
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="gfortran"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="/usr/bin/grep -E"
-
-# The linker used to build libraries.
-LD="/usr/i586-suse-linux/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# 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=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=1572864
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=""
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience 
\${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# 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="\${libname}\${release}\${shared_ext}\$versuffix 
\${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname 
\$wl\$soname -o \$lib"
-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 -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname 
\$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-=======
 old_striplib="strip -S"
 striplib="strip -x"
->>>>>>> 1.14
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -7444,18 +7087,10 @@
 link_all_deplibs=yes
 
 # Compile-time system search path for libraries
-<<<<<<< libtool
-sys_lib_search_path_spec="/usr/lib/gcc/i586-suse-linux/4.3 
/usr/i586-suse-linux/lib /usr/lib /lib"
-=======
 sys_lib_search_path_spec="/usr/lib/i686-apple-darwin9/4.0.1 /usr/lib 
/usr/lib/gcc/i686-apple-darwin9/4.0.1 /usr/local/lib"
->>>>>>> 1.14
 
 # Run-time system search path for libraries
-<<<<<<< libtool
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib/Xaw3d /usr/X11R6/lib 
/usr/lib/Xaw3d /usr/i386-suse-linux/lib /usr/local/lib /opt/kde3/lib 
/usr/i486-linux-libc5/lib/BORKBORKBORK "
-=======
 sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
->>>>>>> 1.14
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""

Index: src/five_point.cpp
===================================================================
RCS file: /cvsroot/toon/tag/src/five_point.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/five_point.cpp  22 Apr 2009 17:05:25 -0000      1.1
+++ src/five_point.cpp  22 Apr 2009 19:59:36 -0000      1.2
@@ -1,9 +1,8 @@
-#include <TooN/TooN.h>
+#include <tag/five_point.h>
+
 #include <TooN/helpers.h>
 #include <TooN/gauss_jordan.h>
 #include <TooN/SVD.h>
-#include <utility>
-#include <tr1/array>
 
 #include "ccmcomplex.h"
 
@@ -12,7 +11,7 @@
 using namespace std::tr1;
 
 //CCMath's polyroot
-int plrt(double *cof,int n,Cpx *root,double ra,double rb);
+extern "C" int plrt(double *cof,int n,Cpx *root,double ra,double rb);
 
 void build_matrix(const Vector<9>& X, const Vector<9>& Y, const Vector<9>& Z, 
const Vector<9>& W, Matrix<10,20>& R);
 
@@ -55,7 +54,7 @@
                val *= x;
        }
 
-       val += p[0];
+       val += v[0];
        return val;
 }
 
@@ -64,6 +63,7 @@
        return Matrix<3, 3, double, Reference::RowMajor>(&v[0]);
 }
 
+namespace tag {
 
 vector<Matrix<3> > five_point(array<pair<Vector<3>, Vector<3> >, 5> points)
 {
@@ -96,6 +96,8 @@
        for(int i=0; i < 5; i++)
                Q[i] = stack_points(points[i].first, points[i].second);
                
+       cout << "Q\n" << Q << endl;
+       
        SVD<9, 9> svd_Q(Q);
 
        //The null-space it the last 4 rows of svd_Q.get_VT()
@@ -106,14 +108,39 @@
        Vector<9> Z = svd_Q.get_VT()[7];
        Vector<9> W = svd_Q.get_VT()[8];
 
+    cout << "X\t" << X << "\t\t Q * X\t" << Q * X << endl;
+    cout << "Y\t" << Y << "\t\t Q * Y\t" << Q * Y << endl;
+    cout << "Z\t" << Z << "\t\t Q * Z\t" << Q * Z << endl;
+    cout << "W\t" << W << "\t\t Q * W\t" << Q * W << endl;
+
+
+X = makeVector( -0.3508458,   0.4252379 ,  0.1214881 , -0.1338175 ,  0.1639596 
,  0.6245507 ,  -0.4360203 , -0.2116077 , -0.1075906 );
+Y = makeVector(  -0.0081994,   0.6219738,  -0.3402116 , -0.3747868 ,  
0.3759810 , -0.2746115 ,  0.3076462 ,  0.0462667 ,  0.2081162 );
+Z = makeVector(  -0.3009486,   0.2482359,   0.5399394  , 0.0511941 , 
-0.0154038 , -0.3929876 , -0.2147039 ,  0.5882101 , -0.0829940 );
+W = makeVector(  -0.6655390,  -0.0115146,  -0.4274621  , 0.4664177 , 
-0.1470300  , 0.1107449 ,  0.2253744 ,  0.1945985 ,  0.1846930 );
+
+
+    cout << "nullspace new\n";
+    cout << "X\t" << X << "\t\t Q * X\t" << Q * X << endl;
+    cout << "Y\t" << Y << "\t\t Q * Y\t" << Q * Y << endl;
+    cout << "Z\t" << Z << "\t\t Q * Z\t" << Q * Z << endl;
+    cout << "W\t" << W << "\t\t Q * W\t" << Q * W << endl;
+
+
        
        Matrix<10,20> R;
        build_matrix(X, Y, Z, W, R);
 
+    cout << "R\n" << R << endl;
+    Matrix<10,20> R_copy = R;
+
+
        //Columns are:
        // x^3 y^3 x^2y xy^2 x^2z x^2 y^2 x^2z y^2 xyz xy | z^2x zx x    z^2y 
zy y   z^3 z^2 z 1 
        gauss_jordan(R);
 
+    cout << "R Jordan\n" << R << endl;
+
        //Build the B matrix (Eqn 13 1/2)
        //Polynomials of degree N are stored in a Vector<N+1> with Vector[0] as 
the coefficient of 1.
        //
@@ -164,6 +191,8 @@
        //The polynomial is...
        Vector<11> n = poly_mul(p1, b_31) + poly_mul(p2, b_32) + poly_mul(p3, 
b_33);
 
+    cout << "poly\t" << n << endl;
+
        Cpx roots[10];  
        
        //Use the CCMath root finder.
@@ -172,12 +201,16 @@
        // Return value means:
        // 0 -> normal exit
     // m>0 -> convergence failure for roots k<m
-       int num = plrt(&n[0], 10, roots, -1, 1);
+       int num = plrt(&n[0], 10, roots, 40, -10);
 
        vector<Matrix<3> > Es;
 
+    cout << "roots\t" << num << endl;
+
        for(int i=num; i < 10; i++)
        {
+           cout <<  roots[i].re << "\t" << roots[i].im << endl;
+       
                if(abs(roots[i].im) < 1e-10)
                {
                        double z = roots[i].re;
@@ -197,10 +230,19 @@
                        double y = polyval(p2, z)/polyval(p3,z);
 
                        Es.push_back(x * as_matrix(X) + y*as_matrix(Y) + 
z*as_matrix(Z) + as_matrix(W));
+#if 1          
+                       Vector<20> coeffs = makeVector(x*x*x, y*y*y, x*x*y, 
x*y*y, x*x*z, x*x, y*y*z, y*y, x*y*z, x*y, x*z*z, x*z, x, y*z*z, y*z, y, z*z*z, 
z*z, z, 1);
+                       cout << R_copy * coeffs << endl;
+                       cout << R * coeffs << endl;
+                       cout << endl;
+
+#endif
                }
        }
 
        return Es;
 }
 
+}
+
 

Index: tag/helpers.h
===================================================================
RCS file: /cvsroot/toon/tag/tag/helpers.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tag/helpers.h       9 Dec 2008 20:33:42 -0000       1.2
+++ tag/helpers.h       22 Apr 2009 19:59:37 -0000      1.3
@@ -2,7 +2,6 @@
 #define TAG_HELPERS_H
 
 #include <TooN/se3.h>
-#include <TooN/wls_cholesky.h>
 
 namespace tag {
 
@@ -28,6 +27,8 @@
 /// @param end iterator to the end of the sequence (after the last element)
 /// @param[out] H resulting homography
 /// @ingroup helpersgroup
+
+#if 0
 template <class It> void getProjectiveHomography(It begin, It end, 
TooN::Matrix<3>& H){
     assert(std::distance(begin,end) >= 4);
 
@@ -49,6 +50,7 @@
     H[2][2] = 1;
 }
 
+
 /// return version of the 2D homography estimation between two sets of 
correspondences.
 /// The observations passed (via iterators) to the estimate method must allow:
 /// @code
@@ -68,6 +70,8 @@
     return H;
 }
 
+#endif
+
 /// creates a cross product matrix M from a 3 vector v, such that for all 
vectors w, the following holds: v ^ w = M * w
 /// @param vec the 3 vector input
 /// @param[out] result the 3x3 matrix to set to the cross product matrix
@@ -94,8 +98,8 @@
 /// @param transform the transformation as SE3
 /// @param[out] E the 3x3 matrix set to the essential matrix
 /// @ingroup helpersgroup
-template<class M> inline void getEssentialMatrix(const TooN::SE3 & transform , 
M & E){
-    assert(E.num_cols() == 3 && E.num_rows() == 3);
+template<class M> inline void getEssentialMatrix(const TooN::SE3<> & transform 
, M & E){
+    //assert(E.num_cols() == 3 && E.num_rows() == 3);
     const TooN::Vector<3> & t = transform.get_translation();
     const TooN::Matrix<3> & r = transform.get_rotation().get_matrix();
     E[0] = t[1] * r[2] - t[2] * r[1];
@@ -107,7 +111,7 @@
 /// @param transform the transformation as SE3
 /// @return the 3x3 matrix set to the essential matrix
 /// @ingroup helpersgroup
-inline TooN::Matrix<3> getEssentialMatrix(const TooN::SE3 & transform ){
+inline TooN::Matrix<3> getEssentialMatrix(const TooN::SE3<> & transform ){
     TooN::Matrix<3> E;
     getEssentialMatrix(transform, E);
     return E;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]