Build fixes for GPU module.

2013-12-19 18:36:02 +04:00
parent 2509fa8080
commit 069f3d8d9a
11 changed files with 33 additions and 31 deletions
--- a/modules/stitching/src/stitcher.cpp
+++ b/modules/stitching/src/stitcher.cpp
@@ -58,7 +58,7 @@ Stitcher Stitcher::createDefault(bool try_use_gpu)
    stitcher.setFeaturesMatcher(new detail::BestOf2NearestMatcher(try_use_gpu));
    stitcher.setBundleAdjuster(new detail::BundleAdjusterRay());

-#ifdef HAVE_OPENCV_GPU
+#if defined(HAVE_OPENCV_GPU) && !defined(ANDROID)
    if (try_use_gpu && gpu::getCudaEnabledDeviceCount() > 0)
    {
 #if defined(HAVE_OPENCV_NONFREE)