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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2021-10-07 04:27:22 +00:00
parent 4dd3ab8f32 a3d7811f24
commit 03a08435e2
7 changed files with 70 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/system.cpp
+7
View File
@@ -1786,6 +1786,13 @@ static void WINAPI opencv_fls_destructor(void* pData)
#endif // CV_USE_FLS
#endif // _WIN32
static TlsAbstraction* const g_force_initialization_of_TlsAbstraction
#if defined __GNUC__
__attribute__((unused))
#endif
= getTlsAbstraction();
#else // OPENCV_DISABLE_THREAD_SUPPORT
// no threading (OPENCV_DISABLE_THREAD_SUPPORT=ON)