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

All modules (except ocl and gpu) compiles and pass tests

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-20 20:13:46 +04:00
parent 762aefd71b
commit 2ad7b97f1c
91 changed files with 606 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ namespace cv
// int channels = mat_dst.oclchannels();
// int depth = mat_dst.depth();
// std::string kernelName = "merge_vector";
// cv::String kernelName = "merge_vector";
// int indexes[4][7] = {{0, 0, 0, 0, 0, 0, 0},
// {4, 4, 2, 2, 1, 1, 1},
@@ -135,7 +135,7 @@ namespace cv
int channels = mat_dst.oclchannels();
int depth = mat_dst.depth();
std::string kernelName = "merge_vector";
cv::String kernelName = "merge_vector";
int vector_lengths[4][7] = {{0, 0, 0, 0, 0, 0, 0},
{2, 2, 1, 1, 1, 1, 1},
@@ -233,7 +233,7 @@ namespace cv
// int channels = mat_src.oclchannels();
// int depth = mat_src.depth();
// std::string kernelName = "split_vector";
// cv::String kernelName = "split_vector";
// int indexes[4][7] = {{0, 0, 0, 0, 0, 0, 0},
// {8, 8, 8, 8, 4, 4, 2},
@@ -284,7 +284,7 @@ namespace cv
int channels = mat_src.oclchannels();
int depth = mat_src.depth();
std::string kernelName = "split_vector";
cv::String kernelName = "split_vector";
int vector_lengths[4][7] = {{0, 0, 0, 0, 0, 0, 0},
{4, 4, 2, 2, 1, 1, 1},