[Toon-members] tag libtool tag/intersection.h

[Qi Pan]

CVSROOT:        /sources/toon
Module name:    tag
Changes by:     Qi Pan <qpan>   10/01/13 16:28:22

Modified files:
        .              : libtool 
        tag            : intersection.h 

Log message:
        Fixed to work with TooN2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/libtool?cvsroot=toon&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/tag/tag/intersection.h?cvsroot=toon&r1=1.2&r2=1.3

Patches:
Index: libtool
===================================================================
RCS file: /sources/toon/tag/libtool,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libtool     17 Nov 2009 15:08:11 -0000      1.20
+++ libtool     13 Jan 2010 16:28:21 -0000      1.21
@@ -2,7 +2,7 @@
 
 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (tag) 0.1
-# Libtool was configured on host bullfrog:
+# Libtool was configured on host optimus:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -237,7 +237,7 @@
 sys_lib_search_path_spec="/usr/lib64/gcc/x86_64-suse-linux/4.3 /usr/lib64 
/lib64 /usr/x86_64-suse-linux/lib"
 
 # Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /usr/local/lib64 
/usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/lib64/Xaw3d /usr/X11R6/lib/Xaw3d 
/usr/X11R6/lib /usr/lib/Xaw3d /usr/x86_64-suse-linux/lib /opt/kde3/lib /lib64 
/lib /usr/lib64 /usr/lib /usr/local/lib64 /opt/kde3/lib64 /usr/lib64/graphviz 
/usr/lib64/graphviz/sharp /usr/lib64/graphviz/java /usr/lib64/graphviz/perl 
/usr/lib64/graphviz/php /usr/lib64/graphviz/ocaml /usr/lib64/graphviz/python 
/usr/lib64/graphviz/lua /usr/lib64/graphviz/tcl /usr/lib64/graphviz/guile 
/usr/lib64/graphviz/ruby /usr/i486-linux-libc5/lib /usr/local/lib 
/usr/local/lib64 "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib64/Xaw3d 
/usr/X11R6/lib64 /usr/lib64/Xaw3d /usr/X11R6/lib/Xaw3d /usr/X11R6/lib 
/usr/lib/Xaw3d /usr/x86_64-suse-linux/lib /usr/local/lib /opt/kde3/lib /lib64 
/lib /usr/lib64 /usr/lib /usr/local/lib64 /opt/kde3/lib64 /usr/lib64/graphviz 
/usr/lib64/graphviz/sharp /usr/lib64/graphviz/java /usr/lib64/graphviz/perl 
/usr/lib64/graphviz/php /usr/lib64/graphviz/ocaml /usr/lib64/graphviz/python 
/usr/lib64/graphviz/lua /usr/lib64/graphviz/tcl /usr/lib64/graphviz/guile 
/usr/lib64/graphviz/ruby /usr/i486-linux-libc5/lib "
 
 # Whether dlopen is supported.
 dlopen_support=unknown

Index: tag/intersection.h
===================================================================
RCS file: /sources/toon/tag/tag/intersection.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tag/intersection.h  21 Jul 2006 10:45:04 -0000      1.2
+++ tag/intersection.h  13 Jan 2010 16:28:22 -0000      1.3
@@ -17,8 +17,8 @@
 /// test for plane and line being parallel might depend on the magnitude
 /// of these vectors.
 /// @ingroup intersection
-template<typename A, typename B, typename C, typename D>
-inline bool intersect_plane_line( const TooN::FixedVector<3,A> & normal, const 
double d, const TooN::FixedVector<3,B> & p1, const TooN::FixedVector<3,C> & p2, 
TooN::FixedVector<3,D> & i){
+template<typename A, typename B, typename C, typename D, typename ABase, 
typename BBase, typename CBase, typename DBase>
+inline bool intersect_plane_line( const TooN::Vector<3,A, ABase> & normal, 
const double d, const TooN::Vector<3,B, BBase> & p1, const TooN::Vector<3,C, 
CBase> & p2, TooN::Vector<3,D, DBase> & i){
     const double EPSILON = 0.000001;
 
     TooN::Vector<3> dir = p2 - p1;
@@ -186,10 +186,10 @@
     // compute interval points by intersecting with respective planes
     // we know that they intersect, therefore no test for failure
     TooN::Matrix<4,3> intersections;
-    intersect_plane_line( nw, dw, *tv[iv], *tv[(iv+1)%3], intersections[0] );
-    intersect_plane_line( nw, dw, *tv[iv], *tv[(iv+2)%3], intersections[1] );
-    intersect_plane_line( nv, dv, *tw[iw], *tw[(iw+1)%3], intersections[2] );
-    intersect_plane_line( nv, dv, *tw[iw], *tw[(iw+2)%3], intersections[3] );
+    intersect_plane_line( nw, dw, *tv[iv], *tv[(iv+1)%3], 
intersections[0].ref() );
+    intersect_plane_line( nw, dw, *tv[iv], *tv[(iv+2)%3], 
intersections[1].ref() );
+    intersect_plane_line( nv, dv, *tw[iw], *tw[(iw+1)%3], 
intersections[2].ref() );
+    intersect_plane_line( nv, dv, *tw[iw], *tw[(iw+2)%3], 
intersections[3].ref() );
 
     // project onto line
     TooN::Vector<4> proj = intersections * d;