[Toon-members] tag src/five_point.cpp tag/five_point.h

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/toon
Module name:    tag
Changes by:     Gerhard Reitmayr <gerhard>      09/04/23 09:02:42

Modified files:
        src            : five_point.cpp 
Added files:
        tag            : five_point.h 

Log message:
        generation of data matrix flipped order to be correct, added missing 
header file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/src/five_point.cpp?cvsroot=toon&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/tag/tag/five_point.h?cvsroot=toon&rev=1.1

Patches:
Index: src/five_point.cpp
===================================================================
RCS file: /cvsroot/toon/tag/src/five_point.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/five_point.cpp  22 Apr 2009 23:23:12 -0000      1.4
+++ src/five_point.cpp  23 Apr 2009 09:02:42 -0000      1.5
@@ -57,10 +57,6 @@
        }
 
        nroots = atmin - atmax;
-
-       /*
-        * perform the bisection.
-        */
        sbisect(num_poly, sseq, min, max, atmin, atmax, &roots[0]);
 }
 
@@ -160,7 +156,7 @@
 
        Matrix<9, 9> Q = Zero;
        for(int i=0; i < 5; i++)
-               Q[i] = stack_points(points[i].first, points[i].second);
+               Q[i] = stack_points(points[i].second, points[i].first);
 
        SVD<9, 9> svd_Q(Q);
 

Index: tag/five_point.h
===================================================================
RCS file: tag/five_point.h
diff -N tag/five_point.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tag/five_point.h    23 Apr 2009 09:02:42 -0000      1.1
@@ -0,0 +1,15 @@
+#ifndef TAG_FIVE_POINT
+#define TAG_FIVE_POINT
+
+#include <vector>
+#include <utility>
+#include <tr1/array>
+#include <TooN/TooN.h>
+
+namespace tag {
+
+std::vector<TooN::Matrix<3> > 
five_point(std::tr1::array<std::pair<TooN::Vector<3>, TooN::Vector<3> >, 5> 
points);
+
+}
+
+#endif // TAG_FIVE_POINT