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

renamed gpuoptflow -> cudaoptflow

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-07-23 17:04:38 +04:00
parent a0ae602bb7
commit 5660d6a680
47 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/superres/src/btv_l1_gpu.cpp
View File

@@ -267,7 +267,7 @@ namespace
blurKernelSize_ = 5;
blurSigma_ = 0.0;
#ifdef HAVE_OPENCV_GPUOPTFLOW
#ifdef HAVE_OPENCV_CUDAOPTFLOW
opticalFlow_ = createOptFlow_Farneback_GPU();
#else
opticalFlow_ = createOptFlow_Farneback();

6
modules/superres/src/optical_flow.cpp
View File

@@ -343,7 +343,7 @@ Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1()
///////////////////////////////////////////////////////////////////
// GpuOpticalFlow
#ifndef HAVE_OPENCV_GPUOPTFLOW
#ifndef HAVE_OPENCV_CUDAOPTFLOW
Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Farneback_GPU()
{
@@ -369,7 +369,7 @@ Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_PyrLK_GPU()
return Ptr<DenseOpticalFlowExt>();
}
#else // HAVE_OPENCV_GPUOPTFLOW
#else // HAVE_OPENCV_CUDAOPTFLOW
namespace
{
@@ -717,7 +717,7 @@ Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1_GPU()
return new DualTVL1_GPU;
}
#endif // HAVE_OPENCV_GPUOPTFLOW
#endif // HAVE_OPENCV_CUDAOPTFLOW
#ifdef HAVE_OPENCV_OCL
namespace

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

@@ -73,8 +73,8 @@
# include "opencv2/cudaimgproc.hpp"
#endif
#ifdef HAVE_OPENCV_GPUOPTFLOW
# include "opencv2/gpuoptflow.hpp"
#ifdef HAVE_OPENCV_CUDAOPTFLOW
# include "opencv2/cudaoptflow.hpp"
#endif
#ifdef HAVE_OPENCV_CUDACODEC