mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions 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 2022-06-16 11:04:50 +00:00
commit 734e309b3e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown
View File

@ -232,7 +232,7 @@ The following is an adaptation of @ref tutorial_js_face_detection.
@code{.js} @code{.js}
const { Canvas, createCanvas, Image, ImageData, loadImage } = require('canvas'); const { Canvas, createCanvas, Image, ImageData, loadImage } = require('canvas');
const { JSDOM } = require('jsdom'); const { JSDOM } = require('jsdom');
const { writeFileSync, readFileSync } = require('fs'); const { writeFileSync, existsSync, mkdirSync } = require('fs');
(async () => { (async () => {
await loadOpenCV(); await loadOpenCV();

9
modules/core/src/system.cpp
View File

@ -604,13 +604,20 @@ struct HWFeatures
close(cpufile); close(cpufile);
} }
#endif #endif
#elif (defined __clang__ || defined __APPLE__) #elif (defined __APPLE__)
#if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__)) #if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__))
have[CV_CPU_NEON] = true; have[CV_CPU_NEON] = true;
#endif #endif
#if (defined __ARM_FP && (((__ARM_FP & 0x2) != 0) && defined __ARM_NEON__)) #if (defined __ARM_FP && (((__ARM_FP & 0x2) != 0) && defined __ARM_NEON__))
have[CV_CPU_FP16] = true; have[CV_CPU_FP16] = true;
#endif #endif
#elif (defined __clang__)
#if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__))
have[CV_CPU_NEON] = true;
#if (defined __ARM_FP && ((__ARM_FP & 0x2) != 0))
have[CV_CPU_FP16] = true;
#endif
#endif
#endif #endif
#if defined _ARM_ && (defined(_WIN32_WCE) && _WIN32_WCE >= 0x800) #if defined _ARM_ && (defined(_WIN32_WCE) && _WIN32_WCE >= 0x800)
have[CV_CPU_NEON] = true; have[CV_CPU_NEON] = true;