generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renmaed gpu module -> cuda

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-24 11:41:44 +04:00
parent 29386f1449
commit ae94256edc
58 changed files with 45 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
set(the_description "Images stitching")
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_gpu opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_nonfree)
OPTIONAL opencv_cuda opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_nonfree)

2
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
View File

@@ -227,7 +227,7 @@ private:
};
#ifdef HAVE_OPENCV_GPU
#ifdef HAVE_OPENCV_CUDA
class CV_EXPORTS GraphCutSeamFinderGpu : public GraphCutSeamFinderBase, public PairwiseSeamFinder
{
public:

4
modules/stitching/src/precomp.hpp
View File

@@ -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

2
modules/stitching/src/seam_finders.cpp
View File

@@ -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)
{

2
modules/stitching/src/stitcher.cpp
View File

@@ -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