From 1a8d7f95873228a5a8903c167f4f8ea5d76d3cec Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 22 Jun 2015 14:24:11 +0300 Subject: [PATCH] ocl: temporary restore OpenCL tls data (ocl.cpp without fix) --- modules/core/src/precomp.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp index cf15359eab..43cacd2ef7 100644 --- a/modules/core/src/precomp.hpp +++ b/modules/core/src/precomp.hpp @@ -265,9 +265,9 @@ struct ImplCollector struct CoreTLSData { CoreTLSData() : -#ifdef HAVE_OPENCL +//#ifdef HAVE_OPENCL device(0), useOpenCL(-1), -#endif +//#endif useIPP(-1) { #ifdef HAVE_TEGRA_OPTIMIZATION @@ -276,11 +276,11 @@ struct CoreTLSData } RNG rng; -#ifdef HAVE_OPENCL +//#ifdef HAVE_OPENCL int device; ocl::Queue oclQueue; 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 #ifdef HAVE_TEGRA_OPTIMIZATION int useTegra; // 1 - use, 0 - do not use, -1 - auto/not initialized