Merge pull request #19443 from asmorkalov:as/guard_nonfree

4 years ago · 23734aff74
parent b08d67c4e1 0016c25b58
commit 23734aff74
1 changed files with 2 additions and 2 deletions
--- a/modules/stitching/test/test_matchers.cpp
+++ b/modules/stitching/test/test_matchers.cpp
@ -44,7 +44,7 @@

 namespace opencv_test { namespace {

-#ifdef HAVE_OPENCV_XFEATURES2D
+#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)

 TEST(SurfFeaturesFinder, CanFindInROIs)
 {
@ -74,7 +74,7 @@ TEST(SurfFeaturesFinder, CanFindInROIs)
    ASSERT_EQ(bad_count, 0);
 }

-#endif // HAVE_OPENCV_XFEATURES2D
+#endif // HAVE_OPENCV_XFEATURES2D && OPENCV_ENABLE_NONFREE

 TEST(ParallelFeaturesFinder, IsSameWithSerial)
 {