diff.txt

Diff with svn rev 4468 to compile with Eigen3 - Boris Mansencal, 2011-01-11 07:31 pm

Download (807 Bytes)

 
1
Index: matchers.cpp
2
===================================================================
3
--- matchers.cpp	(revision 4468)
4
+++ matchers.cpp	(working copy)
5
@@ -41,9 +41,6 @@
6
 
7
 #include "precomp.hpp"
8
 
9
-#ifdef HAVE_EIGEN2
10
-#include <Eigen/Array>
11
-#endif
12
 
13
 using namespace std;
14
 
15
@@ -423,8 +420,8 @@
16
                 int bestTrainIdx = -1, bestImgIdx = -1;
17
                 for( size_t iIdx = 0; iIdx < imgCount; iIdx++ )
18
                 {
19
-                    int loc;
20
-                    float curMaxCoeff = e_allDists[iIdx].maxCoeff( &loc );
21
+		    Eigen::Matrix<float, Eigen::Dynamic, 1>::Index loc, col;
22
+		    float curMaxCoeff = e_allDists[iIdx].maxCoeff( &loc, &col);
23
                     if( curMaxCoeff > totalMaxCoeff )
24
                     {
25
                         totalMaxCoeff = curMaxCoeff;