opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-18 17:24:28 +08:00
Code Issues Releases Wiki Activity

Rename unnamed enum to ORB.ScoreType

Browse Source
This commit is contained in:
Hamdi Sahloul
2018-09-20 06:45:46 +09:00
parent 21b4630698
commit 72e55f5ca3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/cudafeatures2d/test/test_features2d.cpp
View File

@@ -172,9 +172,7 @@ namespace
IMPLEMENT_PARAM_CLASS(ORB_BlurForDescriptor, bool) IMPLEMENT_PARAM_CLASS(ORB_BlurForDescriptor, bool)
} }
CV_ENUM(ORB_ScoreType, cv::ORB::HARRIS_SCORE, cv::ORB::FAST_SCORE) PARAM_TEST_CASE(ORB, cv::cuda::DeviceInfo, ORB_FeaturesCount, ORB_ScaleFactor, ORB_LevelsCount, ORB_EdgeThreshold, ORB_firstLevel, ORB_WTA_K, cv::ORB::ScoreType, ORB_PatchSize, ORB_BlurForDescriptor)
PARAM_TEST_CASE(ORB, cv::cuda::DeviceInfo, ORB_FeaturesCount, ORB_ScaleFactor, ORB_LevelsCount, ORB_EdgeThreshold, ORB_firstLevel, ORB_WTA_K, ORB_ScoreType, ORB_PatchSize, ORB_BlurForDescriptor)
{ {
cv::cuda::DeviceInfo devInfo; cv::cuda::DeviceInfo devInfo;
int nFeatures; int nFeatures;
@@ -183,7 +181,7 @@ PARAM_TEST_CASE(ORB, cv::cuda::DeviceInfo, ORB_FeaturesCount, ORB_ScaleFactor, O
int edgeThreshold; int edgeThreshold;
int firstLevel; int firstLevel;
int WTA_K; int WTA_K;
int scoreType; cv::ORB::ScoreType scoreType;
int patchSize; int patchSize;
bool blurForDescriptor; bool blurForDescriptor;
@@ -260,7 +258,7 @@ INSTANTIATE_TEST_CASE_P(CUDA_Features2D, ORB, testing::Combine(
testing::Values(ORB_EdgeThreshold(31)), testing::Values(ORB_EdgeThreshold(31)),
testing::Values(ORB_firstLevel(0)), testing::Values(ORB_firstLevel(0)),
testing::Values(ORB_WTA_K(2), ORB_WTA_K(3), ORB_WTA_K(4)), testing::Values(ORB_WTA_K(2), ORB_WTA_K(3), ORB_WTA_K(4)),
testing::Values(ORB_ScoreType(cv::ORB::HARRIS_SCORE)), testing::Values(cv::ORB::HARRIS_SCORE),
testing::Values(ORB_PatchSize(31), ORB_PatchSize(29)), testing::Values(ORB_PatchSize(31), ORB_PatchSize(29)),
testing::Values(ORB_BlurForDescriptor(false), ORB_BlurForDescriptor(true)))); testing::Values(ORB_BlurForDescriptor(false), ORB_BlurForDescriptor(true))));