potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +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
2019-12-16 21:30:30 +00:00
parent a11f9e1963 971ae00942
commit c6c8783c60
13 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/flann/include/opencv2/flann/dist.h
+1 -1
View File
@@ -45,7 +45,7 @@ typedef unsigned __int64 uint64_t;
#include "defines.h"
#if defined _WIN32 && defined(_M_ARM)
#if defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64))
# include <Intrin.h>
#endif