using namespace cv;
using namespace cv::ocl;
-
namespace cv
{
namespace ocl
{
if(!mat_dst.clCxt->supportsFeature(FEATURE_CL_DOUBLE) && mat_dst.type() == CV_64F)
{
- CV_Error(CV_OpenCLDoubleNotSupported, "Selected device doesn't support double");
+ CV_Error(Error::OpenCLDoubleNotSupported, "Selected device doesn't support double");
return;
}
int channels = mat_dst.oclchannels();
int depth = mat_dst.depth();
- string kernelName = "merge_vector";
+ String kernelName = "merge_vector";
int vector_lengths[4][7] = {{0, 0, 0, 0, 0, 0, 0},
{2, 2, 1, 1, 1, 1, 1},
size_t globalThreads[3] = { cols, mat_dst.rows, 1 };
int dst_step1 = mat_dst.cols * mat_dst.elemSize();
- vector<pair<size_t , const void *> > args;
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_dst.data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_dst.step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_dst.offset));
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_src[0].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[0].step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[0].offset));
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_src[1].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[1].step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[1].offset));
+ std::vector<std::pair<size_t , const void *> > args;
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_dst.data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_dst.step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_dst.offset));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_src[0].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[0].step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[0].offset));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_src[1].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[1].step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[1].offset));
if(channels == 4)
{
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_src[2].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[2].step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[2].offset));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_src[2].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[2].step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[2].offset));
if(n == 3)
{
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_src[2].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[2].step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[2].offset));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_src[2].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[2].step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[2].offset));
}
else if( n == 4)
{
- args.push_back( make_pair( sizeof(cl_mem), (void *)&mat_src[3].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[3].step));
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_src[3].offset));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&mat_src[3].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[3].step));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_src[3].offset));
}
}
- args.push_back( make_pair( sizeof(cl_int), (void *)&mat_dst.rows));
- args.push_back( make_pair( sizeof(cl_int), (void *)&cols));
- args.push_back( make_pair( sizeof(cl_int), (void *)&dst_step1));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&mat_dst.rows));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&cols));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&dst_step1));
openCLExecuteKernel(clCxt, &merge_mat, kernelName, globalThreads, localThreads, args, channels, depth);
}
if(!src.clCxt->supportsFeature(FEATURE_CL_DOUBLE) && src.type() == CV_64F)
{
- CV_Error(CV_OpenCLDoubleNotSupported, "Selected device doesn't support double");
+ CV_Error(Error::OpenCLDoubleNotSupported, "Selected device doesn't support double");
return;
}
depth = (depth == CV_8S) ? CV_8U : depth;
depth = (depth == CV_16S) ? CV_16U : depth;
- string kernelName = "split_vector";
+ String kernelName = "split_vector";
size_t VEC_SIZE = 4;
- vector<pair<size_t , const void *> > args;
- args.push_back( make_pair( sizeof(cl_mem), (void *)&src.data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&src.step));
+ std::vector<std::pair<size_t , const void *> > args;
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&src.data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&src.step));
int srcOffsetXBytes = src.offset % src.step;
int srcOffsetY = src.offset / src.step;
cl_int2 srcOffset = {{srcOffsetXBytes, srcOffsetY}};
- args.push_back( make_pair( sizeof(cl_int2), (void *)&srcOffset));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&srcOffset));
bool dst0Aligned = false, dst1Aligned = false, dst2Aligned = false, dst3Aligned = false;
int alignSize = dst[0].elemSize1() * VEC_SIZE;
int alignMask = alignSize - 1;
- args.push_back( make_pair( sizeof(cl_mem), (void *)&dst[0].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&dst[0].step));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&dst[0].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&dst[0].step));
int dst0OffsetXBytes = dst[0].offset % dst[0].step;
int dst0OffsetY = dst[0].offset / dst[0].step;
cl_int2 dst0Offset = {{dst0OffsetXBytes, dst0OffsetY}};
- args.push_back( make_pair( sizeof(cl_int2), (void *)&dst0Offset));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&dst0Offset));
if ((dst0OffsetXBytes & alignMask) == 0)
dst0Aligned = true;
- args.push_back( make_pair( sizeof(cl_mem), (void *)&dst[1].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&dst[1].step));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&dst[1].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&dst[1].step));
int dst1OffsetXBytes = dst[1].offset % dst[1].step;
int dst1OffsetY = dst[1].offset / dst[1].step;
cl_int2 dst1Offset = {{dst1OffsetXBytes, dst1OffsetY}};
- args.push_back( make_pair( sizeof(cl_int2), (void *)&dst1Offset));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&dst1Offset));
if ((dst1OffsetXBytes & alignMask) == 0)
dst1Aligned = true;
cl_int2 dst3Offset;
if (channels >= 3)
{
- args.push_back( make_pair( sizeof(cl_mem), (void *)&dst[2].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&dst[2].step));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&dst[2].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&dst[2].step));
dst2OffsetXBytes = dst[2].offset % dst[2].step;
dst2OffsetY = dst[2].offset / dst[2].step;
dst2Offset.s[0] = dst2OffsetXBytes; dst2Offset.s[1] = dst2OffsetY;
- args.push_back( make_pair( sizeof(cl_int2), (void *)&dst2Offset));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&dst2Offset));
if ((dst2OffsetXBytes & alignMask) == 0)
dst2Aligned = true;
}
if (channels >= 4)
{
- args.push_back( make_pair( sizeof(cl_mem), (void *)&dst[3].data));
- args.push_back( make_pair( sizeof(cl_int), (void *)&dst[3].step));
+ args.push_back( std::make_pair( sizeof(cl_mem), (void *)&dst[3].data));
+ args.push_back( std::make_pair( sizeof(cl_int), (void *)&dst[3].step));
dst3OffsetXBytes = dst[3].offset % dst[3].step;
dst3OffsetY = dst[3].offset / dst[3].step;
dst3Offset.s[0] = dst3OffsetXBytes; dst3Offset.s[1] = dst3OffsetY;
- args.push_back( make_pair( sizeof(cl_int2), (void *)&dst3Offset));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&dst3Offset));
if ((dst3OffsetXBytes & alignMask) == 0)
dst3Aligned = true;
}
cl_int2 size = {{ src.cols, src.rows }};
- args.push_back( make_pair( sizeof(cl_int2), (void *)&size));
+ args.push_back( std::make_pair( sizeof(cl_int2), (void *)&size));
- string build_options =
+ String build_options =
cv::format("-D VEC_SIZE=%d -D DATA_DEPTH=%d -D DATA_CHAN=%d",
(int)VEC_SIZE, depth, channels);
if (dst0Aligned)
- build_options += " -D DST0_ALIGNED";
+ build_options = build_options + " -D DST0_ALIGNED";
if (dst1Aligned)
- build_options += " -D DST1_ALIGNED";
+ build_options = build_options + " -D DST1_ALIGNED";
if (dst2Aligned)
- build_options += " -D DST2_ALIGNED";
+ build_options = build_options + " -D DST2_ALIGNED";
if (dst3Aligned)
- build_options += " -D DST3_ALIGNED";
+ build_options = build_options + " -D DST3_ALIGNED";
const DeviceInfo& devInfo = clCtx->getDeviceInfo();
&& (devInfo.deviceVersion.find("Build 56860") != std::string::npos
|| devInfo.deviceVersion.find("Build 76921") != std::string::npos
|| devInfo.deviceVersion.find("Build 78712") != std::string::npos))
- build_options += " -D BYPASS_VSTORE=true";
+ build_options = build_options + " -D BYPASS_VSTORE=true";
size_t globalThreads[3] = { divUp(src.cols, VEC_SIZE), src.rows, 1 };
openCLExecuteKernel(clCtx, &split_mat, kernelName, globalThreads, NULL, args, -1, -1, build_options.c_str());
{
split_merge::merge(src, n, dst);
}
-void cv::ocl::merge(const vector<oclMat> &src, oclMat &dst)
+void cv::ocl::merge(const std::vector<oclMat> &src, oclMat &dst)
{
split_merge::merge(&src[0], src.size(), dst);
}
{
split_merge::split(src, dst);
}
-void cv::ocl::split(const oclMat &src, vector<oclMat> &dst)
+void cv::ocl::split(const oclMat &src, std::vector<oclMat> &dst)
{
dst.resize(src.oclchannels()); // TODO Why oclchannels?
if(src.oclchannels() > 0)
projects / profile / ivi / opencv.git / blobdiff