From a3d088231745d147681d90579ef6e5380d7e5cb5 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sun, 5 Jun 2022 07:52:44 +0000 Subject: [PATCH 1/4] release: OpenCV 3.4.18 --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 4c08d4e3cb..4aa50024b0 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 18 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A) From ed9524e125ed4f60063e581f336a7d5d67a8a01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=B4taro=20Mukai?= Date: Sat, 11 Jun 2022 18:42:30 +0900 Subject: [PATCH 2/4] Missing import --- doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown b/doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown index 17ced36b5a..535ada430a 100644 --- a/doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown +++ b/doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown @@ -232,7 +232,7 @@ The following is an adaptation of @ref tutorial_js_face_detection. @code{.js} const { Canvas, createCanvas, Image, ImageData, loadImage } = require('canvas'); const { JSDOM } = require('jsdom'); -const { writeFileSync, readFileSync } = require('fs'); +const { writeFileSync, existsSync, mkdirSync } = require('fs'); (async () => { await loadOpenCV(); From 7a46d7efde74b145f63e40b47ea8bd4d5be22097 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Wed, 8 Jun 2022 16:29:47 +0200 Subject: [PATCH 3/4] Fix compilation on some ARM architecture. This condition is the same as the line above. --- modules/core/src/system.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index 9bade08177..adb957908d 100644 --- a/modules/core/src/system.cpp +++ b/modules/core/src/system.cpp @@ -598,13 +598,20 @@ struct HWFeatures close(cpufile); } #endif - #elif (defined __clang__ || defined __APPLE__) + #elif (defined __APPLE__) #if (defined __ARM_NEON__ || (defined __ARM_NEON && defined __aarch64__)) have[CV_CPU_NEON] = true; #endif #if (defined __ARM_FP && (((__ARM_FP & 0x2) != 0) && defined __ARM_NEON__)) have[CV_CPU_FP16] = true; #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 #if defined _ARM_ && (defined(_WIN32_WCE) && _WIN32_WCE >= 0x800) have[CV_CPU_NEON] = true; From 572812217b193faef0e28ccc7854c6beee52b55c Mon Sep 17 00:00:00 2001 From: fengyuentau Date: Wed, 15 Jun 2022 18:25:35 +0800 Subject: [PATCH 4/4] re-commit: add workflows for macOS for 3.4 --- .github/workflows/PR-3.4.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/PR-3.4.yaml b/.github/workflows/PR-3.4.yaml index a1efca8c26..1e3282310e 100644 --- a/.github/workflows/PR-3.4.yaml +++ b/.github/workflows/PR-3.4.yaml @@ -13,4 +13,10 @@ jobs: uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-U20.yaml@main W10: - uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-W10.yaml@main \ No newline at end of file + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-W10.yaml@main + + macOS-ARM64: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-macOS-ARM64.yaml@main + + macOS-X64: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-3.4-macOS-x86_64.yaml@main \ No newline at end of file