From 7da51787b9b27495ea754ad441781f6a9e472d3e Mon Sep 17 00:00:00 2001 From: Zhuo Zhang Date: Tue, 19 Oct 2021 21:30:27 +0800 Subject: [PATCH] Merge pull request #20900 from zchrissirhcz:3.4-hwfeatures-support-qnx * fix: correctly check neon flags for QNX platform * refactor: change __QNXNTO__ to __QNX__ --- modules/core/src/system.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 27142a4034..49e146372e 100644 --- a/modules/core/src/system.cpp +++ b/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 # include -#if defined __QNXNTO__ +#if defined __QNX__ # include #else # include @@ -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;