mirror of
https://github.com/opencv/opencv.git
synced 2025-01-19 06:53:50 +08:00
stitching: don't use nonfree by default
This commit is contained in:
parent
1d7bfcc958
commit
ca68fac4b2
@ -59,22 +59,14 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
|
|||||||
#ifdef HAVE_OPENCV_CUDALEGACY
|
#ifdef HAVE_OPENCV_CUDALEGACY
|
||||||
if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
|
if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_OPENCV_XFEATURES2D
|
|
||||||
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinderGpu>());
|
|
||||||
#else
|
|
||||||
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
|
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
|
||||||
#endif
|
|
||||||
stitcher.setWarper(makePtr<SphericalWarperGpu>());
|
stitcher.setWarper(makePtr<SphericalWarperGpu>());
|
||||||
stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinderGpu>());
|
stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinderGpu>());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
#ifdef HAVE_OPENCV_XFEATURES2D
|
|
||||||
stitcher.setFeaturesFinder(makePtr<detail::SurfFeaturesFinder>());
|
|
||||||
#else
|
|
||||||
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
|
stitcher.setFeaturesFinder(makePtr<detail::OrbFeaturesFinder>());
|
||||||
#endif
|
|
||||||
stitcher.setWarper(makePtr<SphericalWarper>());
|
stitcher.setWarper(makePtr<SphericalWarper>());
|
||||||
stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinder>(detail::GraphCutSeamFinderBase::COST_COLOR));
|
stitcher.setSeamFinder(makePtr<detail::GraphCutSeamFinder>(detail::GraphCutSeamFinderBase::COST_COLOR));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user