From 7083f0f815e62e344d6390d2608270f9274f9a3a Mon Sep 17 00:00:00 2001
From: Maria Dimashova <no@email>
Date: Thu, 29 Jul 2010 08:24:51 +0000
Subject: [PATCH] fixed compile error when HAVE_EIGEN2 (#500)

---
 modules/features2d/src/descriptors.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/features2d/src/descriptors.cpp b/modules/features2d/src/descriptors.cpp
index c83e67b305..29d185de30 100644
--- a/modules/features2d/src/descriptors.cpp
+++ b/modules/features2d/src/descriptors.cpp
@@ -300,8 +300,7 @@ void BruteForceMatcher<L2<float> >::matchImpl( const Mat& query, const Mat& /*ma
 {
     matches.clear();
     matches.reserve( query.rows );
-//TODO: remove _DEBUG if bag 416 fixed
-#if (defined _DEBUG || !defined HAVE_EIGEN2)
+#if (!defined HAVE_EIGEN2)
     Mat norms;
     cv::reduce( train.mul( train ), norms, 1, 0);
     norms = norms.t();
@@ -318,12 +317,12 @@ void BruteForceMatcher<L2<float> >::matchImpl( const Mat& query, const Mat& /*ma
 #else
     Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic> desc1t;
     Eigen::Matrix<float, Eigen::Dynamic, Eigen::Dynamic> desc2;
-    cv2eigen( descriptors_1.t(), desc1t);
-    cv2eigen( descriptors_2, desc2 );
+    cv2eigen( query.t(), desc1t);
+    cv2eigen( train, desc2 );
 
     //Eigen::Matrix<float, Eigen::Dynamic, 1> norms = desc2.rowwise().squaredNorm();
     Eigen::Matrix<float, Eigen::Dynamic, 1> norms = desc2.rowwise().squaredNorm() / 2;
-    for( int i=0;i<descriptors_1.rows;i++ )
+    for( int i=0;i<query.rows;i++ )
     {
         //Eigen::Matrix<float, Eigen::Dynamic, 1> distances = (-2) * (desc2*desc1t.col(i));
         Eigen::Matrix<float, Eigen::Dynamic, 1> distances = desc2*desc1t.col(i);