Merge pull request #1290 from mbarnach:bow_desc
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 15:22:46 +0000 (19:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 15:22:47 +0000 (19:22 +0400)
commit4fbd2ef87a638f44b47ed786a9e4d9cd058d6f77
treef99b3f1a2f522a4d72e0b399aee432a1404acf96
parent9eca3ec8f651e55c25094e4e76446f4bd904826c
parentfb9c59dd8d68cd310c6d81952c55626b7f87a07f
Merge pull request #1290 from mbarnach:bow_desc
modules/features2d/doc/object_categorization.rst
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/bagofwords.cpp