potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages 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
modules/videostab/src/global_motion.cpp
+2 -2
View File
@@ -737,7 +737,7 @@ Mat KeypointBasedMotionEstimator::estimate(const Mat &frame0, const Mat &frame1,
}
#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
#if defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW)
KeypointBasedMotionEstimatorGpu::KeypointBasedMotionEstimatorGpu(Ptr<MotionEstimatorBase> estimator)
: ImageMotionEstimatorBase(estimator->motionModel()), motionEstimator_(estimator)
@@ -812,7 +812,7 @@ Mat KeypointBasedMotionEstimatorGpu::estimate(const cuda::GpuMat &frame0, const
return motionEstimator_->estimate(hostPointsPrev_, hostPoints_, ok);
}
#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_GPUOPTFLOW)
#endif // defined(HAVE_OPENCV_CUDAIMGPROC) && defined(HAVE_OPENCV_GPU) && defined(HAVE_OPENCV_CUDAOPTFLOW)
Mat getMotion(int from, int to, const std::vector<Mat> &motions)
modules/videostab/src/inpainting.cpp
+1 -1
View File
@@ -323,7 +323,7 @@ public:
MotionInpainter::MotionInpainter()
{
#ifdef HAVE_OPENCV_GPUOPTFLOW
#ifdef HAVE_OPENCV_CUDAOPTFLOW
setOptFlowEstimator(new DensePyrLkOptFlowEstimatorGpu());
#else
CV_Error(Error::StsNotImplemented, "Current implementation of MotionInpainter requires GPU");
modules/videostab/src/optical_flow.cpp
+2 -2
View File
@@ -58,7 +58,7 @@ void SparsePyrLkOptFlowEstimator::run(
}
#ifdef HAVE_OPENCV_GPUOPTFLOW
#ifdef HAVE_OPENCV_CUDAOPTFLOW
SparsePyrLkOptFlowEstimatorGpu::SparsePyrLkOptFlowEstimatorGpu()
{
@@ -135,7 +135,7 @@ void DensePyrLkOptFlowEstimatorGpu::run(
flowY_.download(flowY.getMatRef());
}
#endif // HAVE_OPENCV_GPUOPTFLOW
#endif // HAVE_OPENCV_CUDAOPTFLOW
} // namespace videostab
} // namespace cv