renmaed gpu module -> cuda

2013-07-24 11:41:44 +04:00
parent 29386f1449
commit ae94256edc
58 changed files with 45 additions and 131 deletions
--- a/modules/stitching/src/precomp.hpp
+++ b/modules/stitching/src/precomp.hpp
@@ -80,8 +80,8 @@
 #  include "opencv2/cudafeatures2d.hpp"
 #endif

-#ifdef HAVE_OPENCV_GPU
-#  include "opencv2/gpu.hpp"
+#ifdef HAVE_OPENCV_CUDA
+#  include "opencv2/cuda.hpp"
 #endif

 #ifdef HAVE_OPENCV_NONFREE
--- a/modules/stitching/src/seam_finders.cpp
+++ b/modules/stitching/src/seam_finders.cpp
@@ -1316,7 +1316,7 @@ void GraphCutSeamFinder::find(const std::vector<Mat> &src, const std::vector<Poi
 }


-#ifdef HAVE_OPENCV_GPU
+#ifdef HAVE_OPENCV_CUDA
 void GraphCutSeamFinderGpu::find(const std::vector<Mat> &src, const std::vector<Point> &corners,
                                 std::vector<Mat> &masks)
 {
--- a/modules/stitching/src/stitcher.cpp
+++ b/modules/stitching/src/stitcher.cpp
@@ -56,7 +56,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
+#ifdef HAVE_OPENCV_CUDA
    if (try_use_gpu && cuda::getCudaEnabledDeviceCount() > 0)
    {
 #ifdef HAVE_OPENCV_NONFREE