turn on CUDA part of stitching module on Android for non-dynamic build(cherry picked from commit a138e5a6a5)

This commit is contained in:
Vladislav Vinogradov
2014-02-03 12:35:24 +04:00
committed by Alexander Smorkalov
parent f15a167df4
commit 3e755b2290
11 changed files with 190 additions and 29 deletions

View File

@@ -58,7 +58,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
stitcher.setFeaturesMatcher(new detail::BestOf2NearestMatcher(try_use_gpu));
stitcher.setBundleAdjuster(new detail::BundleAdjusterRay());
#if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
#if defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
if (try_use_gpu && gpu::getCudaEnabledDeviceCount() > 0)
{
#if defined(HAVE_OPENCV_NONFREE)