mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 15:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19488 from asmorkalov:as/nonfree_check

Browse Source
This commit is contained in:
Alexander Alekhin 2021-02-09 20:38:30 +00:00
commit 4f39f8a8d0
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/perf/opencl/perf_stitch.cpp
View File

@ -19,7 +19,7 @@ namespace ocl {
typedef TestBaseWithParam<string> stitch;
#ifdef HAVE_OPENCV_XFEATURES2D
#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
#define TEST_DETECTORS testing::Values("surf", "orb", "akaze")
#else
#define TEST_DETECTORS testing::Values("orb", "akaze")

2
modules/stitching/perf/perf_estimators.cpp
View File

@ -8,7 +8,7 @@ using namespace perf;
typedef TestBaseWithParam<tuple<string, string> > bundleAdjuster;
#ifdef HAVE_OPENCV_XFEATURES2D
#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
#define TEST_DETECTORS testing::Values("surf", "orb")
#else
#define TEST_DETECTORS testing::Values<string>("orb")

2
modules/stitching/perf/perf_matchers.cpp
View File

@ -17,7 +17,7 @@ typedef TestBaseWithParam<matchVector_t> matchVector;
#define ORB_MATCH_CONFIDENCE 0.3f
#define WORK_MEGAPIX 0.6
#ifdef HAVE_OPENCV_XFEATURES2D
#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
#define TEST_DETECTORS testing::Values("surf", "orb")
#else
#define TEST_DETECTORS testing::Values<string>("orb")

2
modules/stitching/perf/perf_precomp.hpp
View File

@ -11,8 +11,10 @@ static inline Ptr<detail::FeaturesFinder> getFeatureFinder(const std::string& na
{
if (name == "orb")
return makePtr<detail::OrbFeaturesFinder>();
#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
else if (name == "surf")
return makePtr<detail::SurfFeaturesFinder>();
#endif
else if (name == "akaze")
return makePtr<detail::AKAZEFeaturesFinder>();
else

2
modules/stitching/perf/perf_stich.cpp
View File

@ -16,7 +16,7 @@ typedef TestBaseWithParam<string> stitch;
typedef TestBaseWithParam<int> stitchExposureCompensation;
typedef TestBaseWithParam<tuple<string, string> > stitchDatasets;
#ifdef HAVE_OPENCV_XFEATURES2D
#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
#define TEST_DETECTORS testing::Values("surf", "orb", "akaze")
#else
#define TEST_DETECTORS testing::Values("orb", "akaze")