potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +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:
OpenCV Developers
2022-05-14 11:21:33 +00:00
parent 8d0fbc6a1e 766f58ed7e
commit d9a444ca1a
25 changed files with 312 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/parallel.cpp
+1 -1
View File
@@ -986,7 +986,7 @@ int getNumberOfCPUs_()
#endif
#if !defined(_WIN32) && !defined(__APPLE__)
#if !defined(_WIN32) && !defined(__APPLE__) && defined(_SC_NPROCESSORS_ONLN)
static unsigned cpu_count_sysconf = (unsigned)sysconf( _SC_NPROCESSORS_ONLN );
ncpus = minNonZero(ncpus, cpu_count_sysconf);