Using cv::String instead of std::string.
authorPhilippe FOUBERT <philippe.foubert@free.fr>
Sun, 1 Dec 2013 15:41:17 +0000 (16:41 +0100)
committerPhilippe FOUBERT <philippe.foubert@free.fr>
Sun, 1 Dec 2013 15:41:17 +0000 (16:41 +0100)
modules/ocl/src/cl_operations.cpp

index e4ea151..802f2d8 100644 (file)
@@ -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)