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

Revert "Merge pull request #1779 from perping:integral_2.4"

Browse Source 
This reverts commit 54ea5bbac7, reversing
changes made to 28e0d3d771.
This commit is contained in:
Andrey Pavlenko
2014-03-28 16:05:04 +04:00
parent a1d151924d
commit e6e817e613
8 changed files with 301 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -859,10 +859,10 @@ namespace cv
CV_EXPORTS void warpPerspective(const oclMat &src, oclMat &dst, const Mat &M, Size dsize, int flags = INTER_LINEAR);
//! computes the integral image and integral for the squared image
// sum will support CV_32S, CV_32F, sqsum - support CV32F, CV_64F
// sum will have CV_32S type, sqsum - CV32F type
// supports only CV_8UC1 source type
CV_EXPORTS void integral(const oclMat &src, oclMat &sum, oclMat &sqsum, int sdepth=-1 );
CV_EXPORTS void integral(const oclMat &src, oclMat &sum, int sdepth=-1 );
CV_EXPORTS void integral(const oclMat &src, oclMat &sum, oclMat &sqsum);
CV_EXPORTS void integral(const oclMat &src, oclMat &sum);
CV_EXPORTS void cornerHarris(const oclMat &src, oclMat &dst, int blockSize, int ksize, double k, int bordertype = cv::BORDER_DEFAULT);
CV_EXPORTS void cornerHarris_dxdy(const oclMat &src, oclMat &dst, oclMat &Dx, oclMat &Dy,
int blockSize, int ksize, double k, int bordertype = cv::BORDER_DEFAULT);
@@ -936,7 +936,7 @@ namespace cv
Size m_maxSize;
vector<CvSize> sizev;
vector<float> scalev;
oclMat gimg1, gsum, gsqsum, gsqsum_t;
oclMat gimg1, gsum, gsqsum;
void * buffers;
};