Merge pull request #16836 from alalek:stitching_avoid_nonfree_by_default

modules/stitching/src/stitcher.cpp

@@ -59,22 +59,14 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
 #ifdef HAVE_OPENCV_CUDALEGACY
     if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
     {
-#ifdef HAVE_OPENCV_XFEATURES2D
-        stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
-#else
         stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
-#endif
         stitcher.setWarper(makePtr<SphericalWarperGpu>());
         stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinderGpu>());
     }
     else
 #endif
     {
-#ifdef HAVE_OPENCV_XFEATURES2D
-        stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
-#else
         stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
-#endif
         stitcher.setWarper(makePtr<SphericalWarper>());
         stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinder>(detail::GraphCutSeamFinderBase::COST_COLOR));
     }