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

Merge pull request #5231 from alalek:fix_tls

Browse Source
This commit is contained in:
Maksim Shabunin 2015-08-21 15:09:50 +00:00
commit 680efe1a97
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/system.cpp
View File

@ -1089,9 +1089,10 @@ public:
for(size_t i = 0; i < threads.size(); i++)
{
if(threads[i]->slots[slotIdx])
std::vector<void*>& thread_slots = threads[i]->slots;
if (thread_slots.size() > slotIdx && thread_slots[slotIdx])
{
dataVec.push_back(threads[i]->slots[slotIdx]);
dataVec.push_back(thread_slots[slotIdx]);
threads[i]->slots[slotIdx] = 0;
}
}