moved part of f2d docs to the legacy module

modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst

@@ -183,29 +183,6 @@ Wrapping class for computing descriptors by using the
 
 
 
-
-CalonderDescriptorExtractor
----------------------------
-.. ocv:class:: CalonderDescriptorExtractor
-
-Wrapping class for computing descriptors by using the
-:ocv:class:`RTreeClassifier` class. ::
-
-    template<typename T>
-    class CalonderDescriptorExtractor : public DescriptorExtractor
-    {
-    public:
-        CalonderDescriptorExtractor( const string& classifierFile );
-
-        virtual void read( const FileNode &fn );
-        virtual void write( FileStorage &fs ) const;
-        virtual int descriptorSize() const;
-        virtual int descriptorType() const;
-    protected:
-        ...
-    }
-
-
 OpponentColorDescriptorExtractor
 --------------------------------
 .. ocv:class:: OpponentColorDescriptorExtractor

modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst

@@ -238,122 +238,6 @@ Clones the matcher.
             but with empty train data.
 
 
-OneWayDescriptorMatcher
------------------------
-.. ocv:class:: OneWayDescriptorMatcher
-
-Wrapping class for computing, matching, and classifying descriptors using the
-:ocv:class:`OneWayDescriptorBase` class. ::
-
-    class OneWayDescriptorMatcher : public GenericDescriptorMatcher
-    {
-    public:
-        class Params
-        {
-        public:
-            static const int POSE_COUNT = 500;
-            static const int PATCH_WIDTH = 24;
-            static const int PATCH_HEIGHT = 24;
-            static float GET_MIN_SCALE() { return 0.7f; }
-            static float GET_MAX_SCALE() { return 1.5f; }
-            static float GET_STEP_SCALE() { return 1.2f; }
-
-            Params( int poseCount = POSE_COUNT,
-                    Size patchSize = Size(PATCH_WIDTH, PATCH_HEIGHT),
-                    string pcaFilename = string(),
-                    string trainPath = string(), string trainImagesList = string(),
-                    float minScale = GET_MIN_SCALE(), float maxScale = GET_MAX_SCALE(),
-                    float stepScale = GET_STEP_SCALE() );
-
-            int poseCount;
-            Size patchSize;
-            string pcaFilename;
-            string trainPath;
-            string trainImagesList;
-
-            float minScale, maxScale, stepScale;
-        };
-
-        OneWayDescriptorMatcher( const Params& params=Params() );
-        virtual ~OneWayDescriptorMatcher();
-
-        void initialize( const Params& params, const Ptr<OneWayDescriptorBase>& base=Ptr<OneWayDescriptorBase>() );
-
-        // Clears keypoints stored in collection and OneWayDescriptorBase
-        virtual void clear();
-
-        virtual void train();
-
-        virtual bool isMaskSupported();
-
-        virtual void read( const FileNode &fn );
-        virtual void write( FileStorage& fs ) const;
-
-        virtual Ptr<GenericDescriptorMatcher> clone( bool emptyTrainData=false ) const;
-    protected:
-        ...
-    };
-
-
-
-
-FernDescriptorMatcher
----------------------
-.. ocv:class:: FernDescriptorMatcher
-
-Wrapping class for computing, matching, and classifying descriptors using the
-:ocv:class:`FernClassifier` class. ::
-
-    class FernDescriptorMatcher : public GenericDescriptorMatcher
-    {
-    public:
-        class Params
-        {
-        public:
-            Params( int nclasses=0,
-                    int patchSize=FernClassifier::PATCH_SIZE,
-                    int signatureSize=FernClassifier::DEFAULT_SIGNATURE_SIZE,
-                    int nstructs=FernClassifier::DEFAULT_STRUCTS,
-                    int structSize=FernClassifier::DEFAULT_STRUCT_SIZE,
-                    int nviews=FernClassifier::DEFAULT_VIEWS,
-                    int compressionMethod=FernClassifier::COMPRESSION_NONE,
-                    const PatchGenerator& patchGenerator=PatchGenerator() );
-
-            Params( const string& filename );
-
-            int nclasses;
-            int patchSize;
-            int signatureSize;
-            int nstructs;
-            int structSize;
-            int nviews;
-            int compressionMethod;
-            PatchGenerator patchGenerator;
-
-            string filename;
-        };
-
-        FernDescriptorMatcher( const Params& params=Params() );
-        virtual ~FernDescriptorMatcher();
-
-        virtual void clear();
-
-        virtual void train();
-
-        virtual bool isMaskSupported();
-
-        virtual void read( const FileNode &fn );
-        virtual void write( FileStorage& fs ) const;
-
-        virtual Ptr<GenericDescriptorMatcher> clone( bool emptyTrainData=false ) const;
-
-    protected:
-            ...
-    };
-
-
-
-
 VectorDescriptorMatcher
 -----------------------
 .. ocv:class:: VectorDescriptorMatcher

modules/legacy/doc/common_interfaces_of_descriptor_extractors.rst

+Common Interfaces of Descriptor Extractors
+==========================================
+
+.. highlight:: cpp
+
+Extractors of keypoint descriptors in OpenCV have wrappers with a common interface that enables you to easily switch
+between different algorithms solving the same problem. This section is devoted to computing descriptors
+represented as vectors in a multidimensional space. All objects that implement the ``vector``
+descriptor extractors inherit the
+:ocv:class:`DescriptorExtractor` interface.
+
+
+
+CalonderDescriptorExtractor
+---------------------------
+.. ocv:class:: CalonderDescriptorExtractor
+
+Wrapping class for computing descriptors by using the
+:ocv:class:`RTreeClassifier` class. ::
+
+    template<typename T>
+    class CalonderDescriptorExtractor : public DescriptorExtractor
+    {
+    public:
+        CalonderDescriptorExtractor( const string& classifierFile );
+
+        virtual void read( const FileNode &fn );
+        virtual void write( FileStorage &fs ) const;
+        virtual int descriptorSize() const;
+        virtual int descriptorType() const;
+    protected:
+        ...
+    }
\ No newline at end of file

modules/legacy/doc/common_interfaces_of_generic_descriptor_matchers.rst

+Common Interfaces of Generic Descriptor Matchers
+================================================
+
+.. highlight:: cpp
+
+OneWayDescriptorMatcher
+-----------------------
+.. ocv:class:: OneWayDescriptorMatcher
+
+Wrapping class for computing, matching, and classifying descriptors using the
+:ocv:class:`OneWayDescriptorBase` class. ::
+
+    class OneWayDescriptorMatcher : public GenericDescriptorMatcher
+    {
+    public:
+        class Params
+        {
+        public:
+            static const int POSE_COUNT = 500;
+            static const int PATCH_WIDTH = 24;
+            static const int PATCH_HEIGHT = 24;
+            static float GET_MIN_SCALE() { return 0.7f; }
+            static float GET_MAX_SCALE() { return 1.5f; }
+            static float GET_STEP_SCALE() { return 1.2f; }
+
+            Params( int poseCount = POSE_COUNT,
+                    Size patchSize = Size(PATCH_WIDTH, PATCH_HEIGHT),
+                    string pcaFilename = string(),
+                    string trainPath = string(), string trainImagesList = string(),
+                    float minScale = GET_MIN_SCALE(), float maxScale = GET_MAX_SCALE(),
+                    float stepScale = GET_STEP_SCALE() );
+
+            int poseCount;
+            Size patchSize;
+            string pcaFilename;
+            string trainPath;
+            string trainImagesList;
+
+            float minScale, maxScale, stepScale;
+        };
+
+        OneWayDescriptorMatcher( const Params& params=Params() );
+        virtual ~OneWayDescriptorMatcher();
+
+        void initialize( const Params& params, const Ptr<OneWayDescriptorBase>& base=Ptr<OneWayDescriptorBase>() );
+
+        // Clears keypoints stored in collection and OneWayDescriptorBase
+        virtual void clear();
+
+        virtual void train();
+
+        virtual bool isMaskSupported();
+
+        virtual void read( const FileNode &fn );
+        virtual void write( FileStorage& fs ) const;
+
+        virtual Ptr<GenericDescriptorMatcher> clone( bool emptyTrainData=false ) const;
+    protected:
+        ...
+    };
+
+
+
+
+FernDescriptorMatcher
+---------------------
+.. ocv:class:: FernDescriptorMatcher
+
+Wrapping class for computing, matching, and classifying descriptors using the
+:ocv:class:`FernClassifier` class. ::
+
+    class FernDescriptorMatcher : public GenericDescriptorMatcher
+    {
+    public:
+        class Params
+        {
+        public:
+            Params( int nclasses=0,
+                    int patchSize=FernClassifier::PATCH_SIZE,
+                    int signatureSize=FernClassifier::DEFAULT_SIGNATURE_SIZE,
+                    int nstructs=FernClassifier::DEFAULT_STRUCTS,
+                    int structSize=FernClassifier::DEFAULT_STRUCT_SIZE,
+                    int nviews=FernClassifier::DEFAULT_VIEWS,
+                    int compressionMethod=FernClassifier::COMPRESSION_NONE,
+                    const PatchGenerator& patchGenerator=PatchGenerator() );
+
+            Params( const string& filename );
+
+            int nclasses;
+            int patchSize;
+            int signatureSize;
+            int nstructs;
+            int structSize;
+            int nviews;
+            int compressionMethod;
+            PatchGenerator patchGenerator;
+
+            string filename;
+        };
+
+        FernDescriptorMatcher( const Params& params=Params() );
+        virtual ~FernDescriptorMatcher();
+
+        virtual void clear();
+
+        virtual void train();
+
+        virtual bool isMaskSupported();
+
+        virtual void read( const FileNode &fn );
+        virtual void write( FileStorage& fs ) const;
+
+        virtual Ptr<GenericDescriptorMatcher> clone( bool emptyTrainData=false ) const;
+
+    protected:
+            ...
+    };
+

modules/legacy/doc/legacy.rst

@@ -10,3 +10,6 @@ legacy. Deprecated stuff
     motion_analysis
     expectation_maximization
     planar_subdivisions
+    feature_detection_and_description
+    common_interfaces_of_descriptor_extractors
+    common_interfaces_of_generic_descriptor_matchers