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
2023-01-28 10:01:23 +00:00
parent 4d918ba40b deaf632881
commit d3ae175bca
6 changed files with 302 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/parallel.cpp
+2
View File
@@ -275,7 +275,9 @@ namespace {
void recordException(const cv::String& msg)
#endif
{
#ifndef CV_THREAD_SANITIZER
if (!hasException)
#endif
{
cv::AutoLock lock(cv::getInitializationMutex());
if (!hasException)