Merge pull request #8364 from csukuangfj:patch-2

This commit is contained in:
Vadim Pisarevsky 2017-03-22 14:13:13 +00:00
commit 0b3d13645f

View File

@ -272,8 +272,8 @@ struct CoreTLSData
RNG rng; RNG rng;
//#ifdef HAVE_OPENCL //#ifdef HAVE_OPENCL
int device; int device; // device index of an array of devices in a context, see also Device::getDefault
ocl::Queue oclQueue; ocl::Queue oclQueue; // the queue used for running a kernel, see also getQueue, Kernel::run
int useOpenCL; // 1 - use, 0 - do not use, -1 - auto/not initialized int useOpenCL; // 1 - use, 0 - do not use, -1 - auto/not initialized
//#endif //#endif
int useIPP; // 1 - use, 0 - do not use, -1 - auto/not initialized int useIPP; // 1 - use, 0 - do not use, -1 - auto/not initialized