potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Fixed build for the TLS-related stuff.

Browse Source
This commit is contained in:
Roman Donchenko
2013-12-16 15:02:42 +04:00
parent 9d8d70d6ca
commit f2befa01f4
5 changed files with 20 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/precomp.hpp
+6 -5
View File
@@ -106,7 +106,6 @@ extern const uchar g_Saturate8u[];
#if defined WIN32 || defined _WIN32
void deleteThreadAllocData();
void deleteThreadData();
#endif
template<typename T1, typename T2=T1, typename T3=T1> struct OpAdd
@@ -233,17 +232,19 @@ inline bool checkScalar(InputArray sc, int atype, int sckind, int akind)
void convertAndUnrollScalar( const Mat& sc, int buftype, uchar* scbuf, size_t blocksize );
struct TLSData
struct CoreTLSData
{
TLSData();
CoreTLSData() : device(0), useOpenCL(-1)
{}
RNG rng;
int device;
ocl::Queue oclQueue;
int useOpenCL; // 1 - use, 0 - do not use, -1 - auto/not initialized
static TLSData* get();
};
extern TLSData<CoreTLSData> coreTlsData;
#if defined(BUILD_SHARED_LIBS)
#if defined WIN32 || defined _WIN32 || defined WINCE
#define CL_RUNTIME_EXPORT __declspec(dllexport)