From: Andrey Kamaev <no@email>
Date: Thu, 29 Mar 2012 03:06:59 +0000 (+0000)
Subject: Implemented missed AlgorithmInfo for BRIEF
X-Git-Tag: accepted/2.0/20130307.220821~938
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce89d00fcf7c97a62d26e8d2738c4ec39f41c7fe;p=profile%2Fivi%2Fopencv.git

Implemented missed AlgorithmInfo for BRIEF
---

diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 08872a8..f3a6626 100644
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -724,6 +724,8 @@ public:
 
     /// @todo read and write for brief
 
+    AlgorithmInfo* info() const;
+
 protected:
     virtual void computeImpl(const Mat& image, vector<KeyPoint>& keypoints, Mat& descriptors) const;
 
diff --git a/modules/features2d/src/brief.cpp b/modules/features2d/src/brief.cpp
index 7247b92..c825707 100644
--- a/modules/features2d/src/brief.cpp
+++ b/modules/features2d/src/brief.cpp
@@ -172,4 +172,20 @@ void BriefDescriptorExtractor::computeImpl(const Mat& image, std::vector<KeyPoin
     test_fn_(sum, keypoints, descriptors);
 }
 
+static Algorithm* createBRIEF() { return new BriefDescriptorExtractor; }
+static AlgorithmInfo brief_info("Feature2D.BRIEF", createBRIEF);
+
+AlgorithmInfo* BriefDescriptorExtractor::info() const
+{
+    static volatile bool initialized = false;
+    if( !initialized )
+    {
+        BriefDescriptorExtractor brief;
+        brief_info.addParam(brief, "bytes", brief.bytes_);
+
+        initialized = true;
+    }
+    return &brief_info;
+}
+
 } // namespace cv
diff --git a/modules/features2d/test/test_features2d.cpp b/modules/features2d/test/test_features2d.cpp
index f7f9c4c..8c5fc6f 100644
--- a/modules/features2d/test/test_features2d.cpp
+++ b/modules/features2d/test/test_features2d.cpp
@@ -697,7 +697,7 @@ void CV_DescriptorMatcherTest::matchTest( const Mat& query, const Mat& train )
             for( size_t i = 0; i < matches.size(); i++ )
             {
                 DMatch& match = matches[i];
-                std::cout << match.distance << std::endl;
+                //std::cout << match.distance << std::endl;
 
                 if( match.queryIdx != (int)i || match.trainIdx != (int)i || std::abs(match.distance) > FLT_EPSILON )
                 {