Skip to content

O
opencv
Commit 680efe1a authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Merge pull request #5231 from alalek:fix_tls

parents 44f86707 b8956d01
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/core/src/system.cpp
View file @ 680efe1a
...@@ -1089,9 +1089,10 @@ public: ...@@ -1089,9 +1089,10 @@ public:
for(size_t i = 0; i < threads.size(); i++) 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; threads[i]->slots[slotIdx] = 0;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment