generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2337 from pmoulon:master

Browse Source
This commit is contained in:
Roman Donchenko 2014-02-17 12:24:48 +04:00 committed by OpenCV Buildbot
commit a0bb74a086
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/include/opencv2/features2d.hpp
View File

@ -829,7 +829,7 @@ CV_EXPORTS Mat windowedMatchingMask( const std::vector<KeyPoint>& keypoints1, co
/* /*
* OpponentColorDescriptorExtractor * OpponentColorDescriptorExtractor
* *
* Adapts a descriptor extractor to compute descripors in Opponent Color Space * Adapts a descriptor extractor to compute descriptors in Opponent Color Space
* (refer to van de Sande et al., CGIV 2008 "Color Descriptors for Object Category Recognition"). * (refer to van de Sande et al., CGIV 2008 "Color Descriptors for Object Category Recognition").
* Input RGB image is transformed in Opponent Color Space. Then unadapted descriptor extractor * Input RGB image is transformed in Opponent Color Space. Then unadapted descriptor extractor
* (set in constructor) computes descriptors on each of the three channel and concatenate * (set in constructor) computes descriptors on each of the three channel and concatenate

2
samples/cpp/freak_demo.cpp
View File

@ -87,7 +87,7 @@ int main( int argc, char** argv ) {
// DESCRIPTOR // DESCRIPTOR
// Our proposed FREAK descriptor // Our proposed FREAK descriptor
// (roation invariance, scale invariance, pattern radius corresponding to SMALLEST_KP_SIZE, // (rotation invariance, scale invariance, pattern radius corresponding to SMALLEST_KP_SIZE,
// number of octaves, optional vector containing the selected pairs) // number of octaves, optional vector containing the selected pairs)
// FREAK extractor(true, true, 22, 4, std::vector<int>()); // FREAK extractor(true, true, 22, 4, std::vector<int>());
FREAK extractor; FREAK extractor;