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

Fixed FREAK on Android

Browse Source
This commit is contained in:
Andrey Kamaev 2012-06-25 11:19:11 +00:00
parent acc031aaba
commit ec3a7665b0
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/features2d/src/features2d_init.cpp
View File

@ -156,6 +156,7 @@ bool cv::initModule_features2d(void)
all &= !FastFeatureDetector_info_auto.name().empty(); all &= !FastFeatureDetector_info_auto.name().empty();
all &= !StarDetector_info_auto.name().empty(); all &= !StarDetector_info_auto.name().empty();
all &= !MSER_info_auto.name().empty(); all &= !MSER_info_auto.name().empty();
all &= !FREAK_info_auto.name().empty();
all &= !ORB_info_auto.name().empty(); all &= !ORB_info_auto.name().empty();
all &= !GFTTDetector_info_auto.name().empty(); all &= !GFTTDetector_info_auto.name().empty();
all &= !HarrisDetector_info_auto.name().empty(); all &= !HarrisDetector_info_auto.name().empty();

2
modules/features2d/src/freak.cpp
View File

@ -584,7 +584,7 @@ void FREAKImpl::drawPattern()
FREAK::FREAK( bool _orientationNormalized, bool _scaleNormalized FREAK::FREAK( bool _orientationNormalized, bool _scaleNormalized
, float _patternScale, int _nOctaves, const std::vector<int>& _selectedPairs ) , float _patternScale, int _nOctaves, const std::vector<int>& _selectedPairs )
: orientationNormalized(_orientationNormalized), scaleNormalized(_scaleNormalized), : orientationNormalized(_orientationNormalized), scaleNormalized(_scaleNormalized),
patternScale(_patternScale), nOctaves(_nOctaves), selectedPairs0(_selectedPairs) patternScale(_patternScale), nOctaves(_nOctaves), extAll(false), nOctaves0(0), selectedPairs0(_selectedPairs)
{ {
} }

2
samples/cpp/freak_demo.cpp
View File

@ -46,7 +46,7 @@
using namespace cv; using namespace cv;
void help( char** argv ) static void help( char** argv )
{ {
std::cout << "\nUsage: " << argv[0] << " [path/to/image1] [path/to/image2] \n" std::cout << "\nUsage: " << argv[0] << " [path/to/image1] [path/to/image2] \n"
<< "This is an example on how to use the keypoint descriptor presented in the following paper: \n" << "This is an example on how to use the keypoint descriptor presented in the following paper: \n"