mirrors/opencv
2
0 Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-10-05 04:03:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin committed 2020-01-28 14:26:57 +03:00
2 parents f856c964e2 223790e6fc
commit 560f85f8e5
40 files changed
+3133 -740
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/core/src/parallel_impl.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ DECLARE_CV_PAUSE
#endif
#ifndef CV_PAUSE
# if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
# if !defined(__SSE__)
# if !defined(__SSE2__)
static inline void cv_non_sse_mm_pause() { __asm__ __volatile__ ("rep; nop"); }
# define _mm_pause cv_non_sse_mm_pause
# endif