Skip to content

Commit

Permalink
Using cv::String instead of std::string.
Browse files Browse the repository at this point in the history
  • Loading branch information
philippefoubert committed Dec 1, 2013
1 parent c056e7f commit ec6f2e1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/ocl/src/cl_operations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void openCLExecuteKernel(Context *ctx, const cv::ocl::ProgramEntry* source, Stri
openCLExecuteKernel_(ctx, source, kernelName, globalThreads, localThreads, args, channels, depth,
build_options);
#else
std::string data_type[] = { "uchar", "char", "ushort", "short", "int", "float", "double"};
String data_type[] = { "uchar", "char", "ushort", "short", "int", "float", "double"};
std::cout << std::endl;
std::cout << "Function Name: " << kernelName;
if(depth >= 0)
Expand Down

0 comments on commit ec6f2e1

Please sign in to comment.