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

Merge pull request #1612 from alalek:ocl_fix_string_info

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-10-14 16:41:43 +04:00 committed by OpenCV Buildbot
commit e90a9e810d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ocl/include/opencv2/ocl/private/opencl_utils.hpp
View File

@ -97,13 +97,14 @@ inline cl_int getStringInfo(Functor f, ObjectType obj, cl_uint name, std::string
if (err != CL_SUCCESS) if (err != CL_SUCCESS)
return err; return err;
param.resize(required); param.clear();
if (required > 0) if (required > 0)
{ {
err = f(obj, name, required, &param.at(0), NULL); std::vector<char> buf(required + 1, char(0));
err = f(obj, name, required, &buf[0], NULL);
if (err != CL_SUCCESS) if (err != CL_SUCCESS)
return err; return err;
param.resize(required - 1); // last symbol is '\0' param = &buf[0];
} }
return CL_SUCCESS; return CL_SUCCESS;