Merge branch 'opencv:4.x' into update_mcc_CCHecker

Author: AleksandrPanov

.github/workflows/PR-4.x.yaml

@@ -26,3 +26,10 @@ 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@main
+
+  openEuler2203-x64:
+    if: "${{ contains(github.event.pull_request.labels.*.name, 'category: cann') }}"
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-O22-CANN.yaml@main

modules/README.md

@@ -72,6 +72,8 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_<r
 
 - **saliency**: Saliency API -- Where humans would look in a scene. Has routines for static, motion and "objectness" saliency.
 
+- **signal**: Signal processing algorithms
+
 - **sfm**: Structure from Motion -- This module contains algorithms to perform 3d reconstruction from 2d images. The core of the module is a light version of Libmv.
 
 - **shape**: Shape Distance and Matching

modules/alphamat/README.md

@@ -1,9 +1,14 @@
 # Computer Vision based Alpha Matting
 
+![Trimap Alphamat Example from Askoy et al 2017](https://github.com/opencv/opencv_contrib/assets/810997/5cafae51-18e1-4e75-9035-6b40c9a064cb)
+
+
+
 This project was part of the Google Summer of Code 2019.
 
-####Student: Muskaan Kularia
-####Mentor: Sunita Nayak
+#### Student: Muskaan Kularia
+#### Mentor: Sunita Nayak
+
 ***
 Alphamatting is the problem of extracting the foreground from an image. Given the input of an image and its corresponding trimap, we try to extract the foreground from the background.
 
@@ -20,4 +25,4 @@ This project is implementation of "[Designing Effective Inter-Pixel Information
 
 [4] Qifeng Chen, Dingzeyu Li, Chi-Keung Tang, "[KNN Matting](http://dingzeyu.li/files/knn-matting-tpami.pdf)", IEEE TPAMI, 2013.
 
-[5] Yagiz Aksoy, "[Affinity Based Matting Toolbox](https://github.com/yaksoy/AffinityBasedMattingToolbox)".
+[5] Yagiz Aksoy, "[Affinity Based Matting Toolbox](https://github.com/yaksoy/AffinityBasedMattingToolbox)".

modules/aruco/CMakeLists.txt

@@ -1,31 +1,2 @@
 set(the_description "ArUco Marker Detection")
 ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d opencv_objdetect WRAP python java objc js)
-ocv_include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-ocv_add_testdata(samples/ contrib/aruco
-    FILES_MATCHING PATTERN "*yml"
-)
-
-ocv_add_testdata(tutorials/aruco_detection/images/ contrib/aruco
-    FILES_MATCHING PATTERN "singlemarkersoriginal.jpg"
-)
-
-ocv_add_testdata(tutorials/aruco_board_detection/images/ contrib/aruco
-    FILES_MATCHING PATTERN "gboriginal.png"
-)
-
-ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
-    FILES_MATCHING PATTERN "choriginal.jpg"
-)
-
-ocv_add_testdata(tutorials/charuco_detection/images/ contrib/aruco
-    FILES_MATCHING PATTERN "chocclusion_original.jpg"
-)
-
-ocv_add_testdata(tutorials/charuco_diamond_detection/images/ contrib/aruco
-    FILES_MATCHING PATTERN "diamondmarkers.png"
-)
-
-ocv_add_testdata(tutorials/aruco_calibration/images/ contrib/aruco
-    FILES_MATCHING REGEX "img_[0-9]+.jpg"
-)

modules/aruco/README.md

@@ -3,10 +3,15 @@ ArUco Marker Detection
 
 **ArUco**
 
+![markers](https://github.com/opencv/opencv_contrib/assets/810997/8d587456-f27f-49e4-9540-28a0477d43fc)
+
 ArUco markers are easy to detect pattern grids that yield up to 1024 different patterns. They were built for augmented reality and later used for camera calibration. Since the grid uniquely orients the square, the detection algorithm can determing the pose of the grid.
 
 **ChArUco**
 
+![screen_charuco](https://github.com/opencv/opencv_contrib/assets/810997/64610da1-ee06-406c-a19b-006b02ac44fd)
+
+
 ArUco markers were improved by interspersing them inside a checkerboard called ChArUco. Checkerboard corner intersections provide more stable corners because the edge location bias on one square is countered by the opposite edge orientation in the connecting square. By interspersing ArUco markers inside the checkerboard, each checkerboard corner gets a label which enables it to be used in complex calibration or pose scenarios where you cannot see all the corners of the checkerboard.
 
-The smallest ChArUco board is 5 checkers and 4 markers called a "Diamond Marker".
+The smallest ChArUco board is 5 checkers and 4 markers called a "Diamond Marker".