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

remove the empty implementation when HAVE_OPENCL not defined

Browse Source
This commit is contained in:
yao
2013-02-23 20:50:03 +08:00
parent d050159f07
commit f1a5c1328c
24 changed files with 10 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/ocl/src/split_merge.cpp
View File

@@ -58,34 +58,6 @@ using std::endl;
///////////////// oclMat merge and split ///////////////////////////////
////////////////////////////////////////////////////////////////////////
#if !defined (HAVE_OPENCL)
namespace cv
{
namespace ocl
{
void cv::ocl::merge(const oclMat *src_mat, size_t count, oclMat &dst_mat)
{
throw_nogpu();
}
void cv::ocl::merge(const vector<oclMat> &src_mat, oclMat &dst_mat)
{
throw_nogpu();
}
void cv::ocl::split(const oclMat &src, oclMat *dst)
{
throw_nogpu();
}
void cv::ocl::split(const oclMat &src, vector<oclMat> &dst)
{
throw_nogpu();
}
}
}
#else /* !defined (HAVE_OPENCL) */
namespace cv
{
namespace ocl
@@ -417,4 +389,3 @@ void cv::ocl::split(const oclMat &src, vector<oclMat> &dst)
if(src.oclchannels() > 0)
split_merge::split(src, &dst[0]);
}
#endif /* !defined (HAVE_OPENCL) */