Merge pull request opencv#19443 from asmorkalov:as/guard_nonfree

alalek · alalek · commit 23734aff7480 · 2021-02-02T11:12:14.000Z
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`
`45`	`45`	`namespace opencv_test { namespace {`
`46`	`46`
`47`		`-#ifdef HAVE_OPENCV_XFEATURES2D`
	`47`	`+#if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)`
`48`	`48`
`49`	`49`	`TEST(SurfFeaturesFinder, CanFindInROIs)`
`50`	`50`	`{`
`@@ -74,7 +74,7 @@ TEST(SurfFeaturesFinder, CanFindInROIs)`
`74`	`74`	`ASSERT_EQ(bad_count, 0);`
`75`	`75`	`}`
`76`	`76`
`77`		`-#endif // HAVE_OPENCV_XFEATURES2D`
	`77`	`+#endif // HAVE_OPENCV_XFEATURES2D && OPENCV_ENABLE_NONFREE`
`78`	`78`
`79`	`79`	`TEST(ParallelFeaturesFinder, IsSameWithSerial)`
`80`	`80`	`{`