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

Merge pull request #526 from taka-no-me:fix_compatibility

Browse Source
This commit is contained in:
cuda-geek 2013-02-22 09:18:18 +04:00 committed by OpenCV Buildbot
commit dea6148a1a
5 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gpu/include/opencv2/gpu/gpu.hpp
View File

@ -815,6 +815,10 @@ struct CV_EXPORTS CannyBuf
GpuMat st1, st2; GpuMat st1, st2;
GpuMat unused; GpuMat unused;
Ptr<FilterEngine_GPU> filterDX, filterDY; Ptr<FilterEngine_GPU> filterDX, filterDY;
CannyBuf() {}
explicit CannyBuf(const Size& image_size, int apperture_size = 3) {create(image_size, apperture_size);}
CannyBuf(const GpuMat& dx_, const GpuMat& dy_);
}; };
CV_EXPORTS void Canny(const GpuMat& image, GpuMat& edges, double low_thresh, double high_thresh, int apperture_size = 3, bool L2gradient = false); CV_EXPORTS void Canny(const GpuMat& image, GpuMat& edges, double low_thresh, double high_thresh, int apperture_size = 3, bool L2gradient = false);
@ -1879,11 +1883,9 @@ private:
vector<GpuMat> prevPyr_; vector<GpuMat> prevPyr_;
vector<GpuMat> nextPyr_; vector<GpuMat> nextPyr_;
GpuMat vPyr_[2]; GpuMat vPyr_[2];
vector<GpuMat> unused1; vector<GpuMat> buf_;
vector<GpuMat> unused2; vector<GpuMat> unused;
bool unused3; bool isDeviceArch11_;
GpuMat buf_;
}; };

3
modules/gpu/src/imgproc.cpp
View File

@ -45,6 +45,9 @@
using namespace cv; using namespace cv;
using namespace cv::gpu; using namespace cv::gpu;
/*stub for deprecated constructor*/
cv::gpu::CannyBuf::CannyBuf(const GpuMat&, const GpuMat&) { }
#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) #if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
void cv::gpu::meanShiftFiltering(const GpuMat&, GpuMat&, int, int, TermCriteria, Stream&) { throw_nogpu(); } void cv::gpu::meanShiftFiltering(const GpuMat&, GpuMat&, int, int, TermCriteria, Stream&) { throw_nogpu(); }

12
modules/gpu/src/pyrlk.cpp
View File

@ -147,11 +147,13 @@ void cv::gpu::PyrLKOpticalFlow::sparse(const GpuMat& prevImg, const GpuMat& next
} }
else else
{ {
cvtColor(prevImg, buf_, COLOR_BGR2BGRA); buf_.resize(1);
buf_.convertTo(prevPyr_[0], CV_32F);
cvtColor(nextImg, buf_, COLOR_BGR2BGRA); cvtColor(prevImg, buf_[0], COLOR_BGR2BGRA);
buf_.convertTo(nextPyr_[0], CV_32F); 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) for (int level = 1; level <= maxLevel; ++level)
@ -237,7 +239,7 @@ void cv::gpu::PyrLKOpticalFlow::releaseMemory()
prevPyr_.clear(); prevPyr_.clear();
nextPyr_.clear(); nextPyr_.clear();
buf_.release(); buf_.clear();
uPyr_[0].release(); uPyr_[0].release();
vPyr_[0].release(); vPyr_[0].release();

9
modules/ocl/include/opencv2/ocl/ocl.hpp
View File

@ -487,10 +487,11 @@ namespace cv
CV_EXPORTS void bitwise_xor(const oclMat &src1, const Scalar &s, oclMat &dst, const oclMat &mask = oclMat()); CV_EXPORTS void bitwise_xor(const oclMat &src1, const Scalar &s, oclMat &dst, const oclMat &mask = oclMat());
//! Logical operators //! Logical operators
CV_EXPORTS oclMatExpr operator ~ (const oclMat &src); CV_EXPORTS oclMat operator ~ (const oclMat &);
CV_EXPORTS oclMatExpr operator | (const oclMat &src1, const oclMat &src2); CV_EXPORTS oclMat operator | (const oclMat &, const oclMat &);
CV_EXPORTS oclMatExpr operator & (const oclMat &src1, const oclMat &src2); CV_EXPORTS oclMat operator & (const oclMat &, const oclMat &);
CV_EXPORTS oclMatExpr operator ^ (const oclMat &src1, const oclMat &src2); CV_EXPORTS oclMat operator ^ (const oclMat &, const oclMat &);
//! Mathematics operators //! Mathematics operators
CV_EXPORTS oclMatExpr operator + (const oclMat &src1, const oclMat &src2); CV_EXPORTS oclMatExpr operator + (const oclMat &src1, const oclMat &src2);

8
modules/ocl/src/arithm.cpp
View File

@ -2125,22 +2125,22 @@ void cv::ocl::bitwise_xor(const oclMat &src1, const Scalar &src2, oclMat &dst, c
bitwise_scalar( src1, src2, dst, mask, kernelName, &arithm_bitwise_xor_scalar); bitwise_scalar( src1, src2, dst, mask, kernelName, &arithm_bitwise_xor_scalar);
} }
oclMatExpr cv::ocl::operator ~ (const oclMat &src) oclMat cv::ocl::operator ~ (const oclMat &src)
{ {
return oclMatExpr(src, oclMat(), MAT_NOT); return oclMatExpr(src, oclMat(), MAT_NOT);
} }
oclMatExpr cv::ocl::operator | (const oclMat &src1, const oclMat &src2) oclMat cv::ocl::operator | (const oclMat &src1, const oclMat &src2)
{ {
return oclMatExpr(src1, src2, MAT_OR); return oclMatExpr(src1, src2, MAT_OR);
} }
oclMatExpr cv::ocl::operator & (const oclMat &src1, const oclMat &src2) oclMat cv::ocl::operator & (const oclMat &src1, const oclMat &src2)
{ {
return oclMatExpr(src1, src2, MAT_AND); return oclMatExpr(src1, src2, MAT_AND);
} }
oclMatExpr cv::ocl::operator ^ (const oclMat &src1, const oclMat &src2) oclMat cv::ocl::operator ^ (const oclMat &src1, const oclMat &src2)
{ {
return oclMatExpr(src1, src2, MAT_XOR); return oclMatExpr(src1, src2, MAT_XOR);
} }