Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-15 07:29:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

move labeling routines from cuda to cudalegacy

Browse Source
This commit is contained in:
Vladislav Vinogradov
2015-01-15 11:18:46 +03:00
parent 3f1fb281be
commit b416e8715d
10 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/CMakeLists.txt
View File

@@ -5,4 +5,4 @@ if(HAVE_CUDA)
endif()
ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect
OPTIONAL opencv_cuda opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_xfeatures2d)
OPTIONAL opencv_cuda opencv_cudaarithm opencv_cudafilters opencv_cudafeatures2d opencv_cudalegacy opencv_xfeatures2d)

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

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

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

@@ -83,8 +83,8 @@
# include "opencv2/cudafeatures2d.hpp"
#endif
#ifdef HAVE_OPENCV_CUDA
# include "opencv2/cuda.hpp"
#ifdef HAVE_OPENCV_CUDALEGACY
# include "opencv2/cudalegacy.hpp"
#endif
#ifdef HAVE_OPENCV_XFEATURES2D

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

@@ -1321,7 +1321,7 @@ void GraphCutSeamFinder::find(const std::vector<UMat> &src, const std::vector<Po
}
#ifdef HAVE_OPENCV_CUDA
#ifdef HAVE_OPENCV_CUDALEGACY
void GraphCutSeamFinderGpu::find(const std::vector<UMat> &src, const std::vector<Point> &corners,
std::vector<UMat> &masks)
{