potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-02-12 21:20:54 +00:00
parent ba8d20e9ae fba70f7991
commit e5d78960c6
20 changed files with 286 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/perf/perf_stich.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ typedef TestBaseWithParam<int> stitchExposureCompensation;
typedef TestBaseWithParam<tuple<string, string> > stitchDatasets;
typedef TestBaseWithParam<tuple<string, int>> stitchExposureCompMultiFeed;
#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")