mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 03:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
peng xiao 2013-07-26 14:32:37 +08:00
parent e1f43e3b03
commit a6d558042c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,13 +69,13 @@ const char * depth_strings[] =
"double" //CV_64F "double" //CV_64F
}; };
void genSortBuildOption(const oclMat& keys, const oclMat& vals, bool isGreaterThan, char * build_opt_buf) void static genSortBuildOption(const oclMat& keys, const oclMat& vals, bool isGreaterThan, char * build_opt_buf)
{ {
sprintf(build_opt_buf, "-D IS_GT=%d -D K_T=%s -D V_T=%s", sprintf(build_opt_buf, "-D IS_GT=%d -D K_T=%s -D V_T=%s",
isGreaterThan?1:0, depth_strings[keys.depth()], depth_strings[vals.depth()]); isGreaterThan?1:0, depth_strings[keys.depth()], depth_strings[vals.depth()]);
if(vals.oclchannels() > 1) if(vals.oclchannels() > 1)
{ {
sprintf( build_opt_buf + strlen(build_opt_buf), "%d", vals.oclchannels(), 10); sprintf( build_opt_buf + strlen(build_opt_buf), "%d", vals.oclchannels());
} }
} }
inline bool isSizePowerOf2(size_t size) inline bool isSizePowerOf2(size_t size)
@ -176,7 +176,7 @@ namespace radix_sort
// openCLExecuteKernel(cxt, &kernel_radix_sort_by_key, kernelname, globalThreads, localThreads, args, -1, -1); // openCLExecuteKernel(cxt, &kernel_radix_sort_by_key, kernelname, globalThreads, localThreads, args, -1, -1);
//} //}
void naive_scan_addition_cpu(oclMat& input, oclMat& output) void static naive_scan_addition_cpu(oclMat& input, oclMat& output)
{ {
Mat m_input = input, m_output(output.size(), output.type()); Mat m_input = input, m_output(output.size(), output.type());
MatIterator_<int> i_mit = m_input.begin<int>(); MatIterator_<int> i_mit = m_input.begin<int>();
@ -277,7 +277,7 @@ static void sort_by_key(oclMat& keys, oclMat& vals, size_t origVecSize, bool isG
String kernelnames[2] = {String("histogramRadixN"), String("permuteRadixN")}; String kernelnames[2] = {String("histogramRadixN"), String("permuteRadixN")};
int swap = 0; int swap = 0;
for(int bits = 0; bits < (keys.elemSize() * 8); bits += RADIX) for(int bits = 0; bits < (static_cast<int>(keys.elemSize()) * 8); bits += RADIX)
{ {
args.clear(); args.clear();
//Do a histogram pass locally //Do a histogram pass locally