potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Fix binary compatibility of gpu module

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-22 00:14:58 +04:00
parent eda2a76ee9
commit 995154d10d
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/src/imgproc.cpp
+3
View File
@@ -45,6 +45,9 @@
using namespace cv;
using namespace cv::gpu;
/*stub for deprecated constructor*/
cv::gpu::CannyBuf::CannyBuf(const GpuMat&, const GpuMat&) { }
#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
void cv::gpu::meanShiftFiltering(const GpuMat&, GpuMat&, int, int, TermCriteria, Stream&) { throw_nogpu(); }
modules/gpu/src/pyrlk.cpp
+7 -5
View File
@@ -147,11 +147,13 @@ void cv::gpu::PyrLKOpticalFlow::sparse(const GpuMat& prevImg, const GpuMat& next
}
else
{
cvtColor(prevImg, buf_, COLOR_BGR2BGRA);
buf_.convertTo(prevPyr_[0], CV_32F);
buf_.resize(1);
cvtColor(nextImg, buf_, COLOR_BGR2BGRA);
buf_.convertTo(nextPyr_[0], CV_32F);
cvtColor(prevImg, buf_[0], COLOR_BGR2BGRA);
buf_[0].convertTo(prevPyr_[0], CV_32F);
cvtColor(nextImg, buf_[0], COLOR_BGR2BGRA);
buf_[0].convertTo(nextPyr_[0], CV_32F);
}
for (int level = 1; level <= maxLevel; ++level)
@@ -237,7 +239,7 @@ void cv::gpu::PyrLKOpticalFlow::releaseMemory()
prevPyr_.clear();
nextPyr_.clear();
buf_.release();
buf_.clear();
uPyr_[0].release();
vPyr_[0].release();