Merge pull request #1184 from apacha:Descriptor_Docu_FREAK_added_2
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 25 Jul 2013 08:00:55 +0000 (12:00 +0400)
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst

index 63e56f6..6488969 100644 (file)
@@ -78,9 +78,10 @@ The current implementation supports the following types of a descriptor extracto
 
  * ``"SIFT"`` -- :ocv:class:`SIFT`
  * ``"SURF"`` -- :ocv:class:`SURF`
- * ``"ORB"`` -- :ocv:class:`ORB`
- * ``"BRISK"`` -- :ocv:class:`BRISK`
  * ``"BRIEF"`` -- :ocv:class:`BriefDescriptorExtractor`
+ * ``"BRISK"`` -- :ocv:class:`BRISK`
+ * ``"ORB"`` -- :ocv:class:`ORB`
+ * ``"FREAK"`` -- :ocv:class:`FREAK`
 
 A combined format is also supported: descriptor extractor adapter name ( ``"Opponent"`` --
 :ocv:class:`OpponentColorDescriptorExtractor` ) + descriptor extractor name (see above),