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

Test accuracy for PR#3829.Fix WOrder warning on gcc

Browse Source
This commit is contained in:
ippei ito 2015-03-25 18:24:52 +09:00
parent d1902a1276
commit 65b0ecfec5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/features2d/test/test_lshindex_flannbased_matcher.cpp
View File

@ -283,9 +283,12 @@ class CV_FeatureDetectorMatcherBaseTest : public cvtest::BaseTest
{ {
private: private:
testparam *tp;
double target_accuracy_margin_from_bfmatcher;
Feature2D* fe; // feature detector extractor
DescriptorMatcher* bfmatcher; // brute force matcher for accuracy of reference DescriptorMatcher* bfmatcher; // brute force matcher for accuracy of reference
DescriptorMatcher* flmatcher; // flann matcher to test DescriptorMatcher* flmatcher; // flann matcher to test
Feature2D* fe; // feature detector extractor
Mat imgQuery; // query image Mat imgQuery; // query image
vector<Mat> imgOutliers; // outlier image vector<Mat> imgOutliers; // outlier image
vector<KeyPoint> query_kp; // query key points detect from imgQuery vector<KeyPoint> query_kp; // query key points detect from imgQuery
@ -295,8 +298,6 @@ private:
int totalOutlierDescCnt; int totalOutlierDescCnt;
string flmatchername; string flmatchername;
testparam *tp;
double target_accuracy_margin_from_bfmatcher;
public: public:
@ -305,10 +306,10 @@ public:
// //
CV_FeatureDetectorMatcherBaseTest(testparam* _tp, double _accuracy_margin, Feature2D* _fe, DescriptorMatcher *_flmatcher, string _flmatchername, int norm_type_for_bfmatcher) : CV_FeatureDetectorMatcherBaseTest(testparam* _tp, double _accuracy_margin, Feature2D* _fe, DescriptorMatcher *_flmatcher, string _flmatchername, int norm_type_for_bfmatcher) :
tp(_tp), tp(_tp),
target_accuracy_margin_from_bfmatcher(_accuracy_margin),
fe(_fe), fe(_fe),
flmatcher(_flmatcher), flmatcher(_flmatcher),
flmatchername(_flmatchername), flmatchername(_flmatchername)
target_accuracy_margin_from_bfmatcher(_accuracy_margin)
{ {
#if defined(INIT_RANDOM_SEED) #if defined(INIT_RANDOM_SEED)
// from test/test_eigen.cpp // from test/test_eigen.cpp