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

Merge pull request #5968 from alalek:fix_5967

Browse Source
This commit is contained in:
Alexander Alekhin 2016-01-14 13:18:38 +00:00
commit c3ad8af42a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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