Merge pull request #19443 from asmorkalov:as/guard_nonfree

pull/19440/head
Alexander Alekhin 4 years ago
commit 23734aff74
  1. 4
      modules/stitching/test/test_matchers.cpp

@ -44,7 +44,7 @@
namespace opencv_test { namespace { namespace opencv_test { namespace {
#ifdef HAVE_OPENCV_XFEATURES2D #if defined(HAVE_OPENCV_XFEATURES2D) && defined(OPENCV_ENABLE_NONFREE)
TEST(SurfFeaturesFinder, CanFindInROIs) TEST(SurfFeaturesFinder, CanFindInROIs)
{ {
@ -74,7 +74,7 @@ TEST(SurfFeaturesFinder, CanFindInROIs)
ASSERT_EQ(bad_count, 0); ASSERT_EQ(bad_count, 0);
} }
#endif // HAVE_OPENCV_XFEATURES2D #endif // HAVE_OPENCV_XFEATURES2D && OPENCV_ENABLE_NONFREE
TEST(ParallelFeaturesFinder, IsSameWithSerial) TEST(ParallelFeaturesFinder, IsSameWithSerial)
{ {

Loading…
Cancel
Save