From: Matthias Bady <aegirxx@gmail.com>
Date: Fri, 20 Dec 2013 09:56:27 +0000 (+0100)
Subject: moved documentation of BriefDescriptorExtractor to correct place
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~690^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b0a9f2a24daa9fac061766418f459e628cc7131;p=profile%2Fivi%2Fopencv.git

moved documentation of BriefDescriptorExtractor to correct place
---

diff --git a/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst b/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
index bf84ed0..637e476 100644
--- a/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
+++ b/modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
@@ -119,35 +119,3 @@ them into a single color descriptor. ::
     protected:
         ...
     };
-
-
-
-BriefDescriptorExtractor
-------------------------
-.. ocv:class:: BriefDescriptorExtractor : public DescriptorExtractor
-
-Class for computing BRIEF descriptors described in a paper of Calonder M., Lepetit V.,
-Strecha C., Fua P. *BRIEF: Binary Robust Independent Elementary Features* ,
-11th European Conference on Computer Vision (ECCV), Heraklion, Crete. LNCS Springer, September 2010. ::
-
-    class BriefDescriptorExtractor : public DescriptorExtractor
-    {
-    public:
-        static const int PATCH_SIZE = 48;
-        static const int KERNEL_SIZE = 9;
-
-        // bytes is a length of descriptor in bytes. It can be equal 16, 32 or 64 bytes.
-        BriefDescriptorExtractor( int bytes = 32 );
-
-        virtual void read( const FileNode& );
-        virtual void write( FileStorage& ) const;
-        virtual int descriptorSize() const;
-        virtual int descriptorType() const;
-        virtual int defaultNorm() const;
-    protected:
-        ...
-    };
-
-.. note::
-
-   * A complete BRIEF extractor sample can be found at opencv_source_code/samples/cpp/brief_match_test.cpp
diff --git a/modules/features2d/doc/feature_detection_and_description.rst b/modules/features2d/doc/feature_detection_and_description.rst
index a6fe7c8..0226347 100644
--- a/modules/features2d/doc/feature_detection_and_description.rst
+++ b/modules/features2d/doc/feature_detection_and_description.rst
@@ -37,6 +37,37 @@ Detects corners using the FAST algorithm by [Rosten06]_.
 .. [Rosten06] E. Rosten. Machine Learning for High-speed Corner Detection, 2006.
 
 
+BriefDescriptorExtractor
+------------------------
+.. ocv:class:: BriefDescriptorExtractor : public DescriptorExtractor
+
+Class for computing BRIEF descriptors described in a paper of Calonder M., Lepetit V.,
+Strecha C., Fua P. *BRIEF: Binary Robust Independent Elementary Features* ,
+11th European Conference on Computer Vision (ECCV), Heraklion, Crete. LNCS Springer, September 2010. ::
+
+    class BriefDescriptorExtractor : public DescriptorExtractor
+    {
+    public:
+        static const int PATCH_SIZE = 48;
+        static const int KERNEL_SIZE = 9;
+
+        // bytes is a length of descriptor in bytes. It can be equal 16, 32 or 64 bytes.
+        BriefDescriptorExtractor( int bytes = 32 );
+
+        virtual void read( const FileNode& );
+        virtual void write( FileStorage& ) const;
+        virtual int descriptorSize() const;
+        virtual int descriptorType() const;
+        virtual int defaultNorm() const;
+    protected:
+        ...
+    };
+
+.. note::
+
+   * A complete BRIEF extractor sample can be found at opencv_source_code/samples/cpp/brief_match_test.cpp
+
+
 MSER
 ----
 .. ocv:class:: MSER : public FeatureDetector