Merge pull request #20900 from zchrissirhcz:3.4-hwfeatures-support-qnx

* fix: correctly check neon flags for QNX platform

* refactor: change __QNXNTO__ to __QNX__
pull/20919/head
Zhuo Zhang 3 years ago committed by GitHub
parent b1f422c1c5
commit 7da51787b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      modules/core/src/system.cpp

@ -129,7 +129,7 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); }
#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__
# include <unistd.h>
# include <fcntl.h>
#if defined __QNXNTO__
#if defined __QNX__
# include <sys/elf.h>
#else
# include <elf.h>
@ -545,7 +545,7 @@ struct HWFeatures
}
#endif // CV_CPUID_X86
#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__
#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __QNX__
#ifdef __aarch64__
have[CV_CPU_NEON] = true;
have[CV_CPU_FP16] = true;

Loading…
Cancel
Save