From aca8759d3118ee047b8ce18bd2c853b1fdb81e5e Mon Sep 17 00:00:00 2001 From: pingplug Date: Thu, 28 Sep 2023 16:05:22 +0800 Subject: [PATCH 1/4] fix wrong detector in detectCharucoDiamond use diamond detector instead of board detector in detectCharucoDiamond() --- modules/aruco/src/charuco.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/aruco/src/charuco.cpp b/modules/aruco/src/charuco.cpp index acf691a28..42dbd0d4a 100644 --- a/modules/aruco/src/charuco.cpp +++ b/modules/aruco/src/charuco.cpp @@ -39,7 +39,7 @@ void detectCharucoDiamond(InputArray _image, InputArrayOfArrays _markerCorners, vector markerCorners; _markerCorners.getMatVector(markerCorners); - detector.detectBoard(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat()); + detector.detectDiamonds(_image, _diamondCorners, _diamondIds, markerCorners, _markerIds.getMat()); } From 3f3ee66ea77d35fc70fd95ff25c91f72f5c9d80b Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 29 Sep 2023 15:25:06 +0300 Subject: [PATCH 2/4] Fixed compilation with SIMD disabled or with scalable SIMD --- modules/rgbd/src/tsdf_functions.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rgbd/src/tsdf_functions.hpp b/modules/rgbd/src/tsdf_functions.hpp index 1031474d0..c763f9275 100644 --- a/modules/rgbd/src/tsdf_functions.hpp +++ b/modules/rgbd/src/tsdf_functions.hpp @@ -16,11 +16,13 @@ namespace cv namespace kinfu { +#if USE_INTRINSICS inline v_float32x4 tsdfToFloat_INTR(const v_int32x4& num) { v_float32x4 num128 = v_setall_f32(-1.f / 128.f); return v_cvt_f32(num) * num128; } +#endif inline TsdfType floatToTsdf(float num) { From 36bb8727192340f038e1222c7599670ebc5cd88c Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 13 Oct 2023 22:47:22 +0300 Subject: [PATCH 3/4] CI: enable RISC-V for 4.x branch --- .github/workflows/PR-4.x.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/PR-4.x.yaml b/.github/workflows/PR-4.x.yaml index 250b5e157..f05e94bfa 100644 --- a/.github/workflows/PR-4.x.yaml +++ b/.github/workflows/PR-4.x.yaml @@ -26,3 +26,6 @@ jobs: macOS-X64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-macOS-x86_64.yaml@main + + Linux-RISC-V-Clang: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-RISCV.yaml From 0bbfa6c3b21cf3c1872c6fa0152673e68820b0ff Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 17 Oct 2023 16:30:31 +0300 Subject: [PATCH 4/4] CI: fixed RISC-V workflow path --- .github/workflows/PR-4.x.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PR-4.x.yaml b/.github/workflows/PR-4.x.yaml index f05e94bfa..bd90f16ca 100644 --- a/.github/workflows/PR-4.x.yaml +++ b/.github/workflows/PR-4.x.yaml @@ -28,4 +28,4 @@ jobs: uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-macOS-x86_64.yaml@main Linux-RISC-V-Clang: - uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-RISCV.yaml + uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-RISCV.yaml@main