Merge pull request #7 from opencv/4.x

Sync 4

.editorconfig

@@ -0,0 +1,31 @@
+# https://editorconfig.org/
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[{CMakeLists.*,*.cmake}]
+indent_style = space
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+
+[*.{bat,cmd,cmd.*}]
+end_of_line = crlf
+indent_style = space
+indent_size = 2
+
+[*.{ps1,ps1.*}]
+end_of_line = crlf
+indent_style = space
+indent_size = 4
+
+[*.{md,markdown}]
+indent_size = 2

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

@@ -12,6 +12,9 @@ jobs:
   Ubuntu2004-x64:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml@main
 
+  Ubuntu2204-x64:
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-U22.yaml@main
+
   Ubuntu2004-x64-CUDA:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml@main
 
@@ -23,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@main

modules/README.md

@@ -12,8 +12,6 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_<r
 
 - **aruco**: ArUco and ChArUco Markers -- Augmented reality ArUco marker and "ChARUco" markers where ArUco markers embedded inside the white areas of the checker board.
 
-- **barcode**: Barcode detecting and decoding methods.
-
 - **bgsegm**: Background segmentation algorithm combining statistical background image estimation and per-pixel Bayesian segmentation.
 
 - **bioinspired**: Biological Vision -- Biologically inspired vision model: minimize noise and luminance variance, transient event segmentation, high dynamic range tone mapping methods.

modules/aruco/include/opencv2/aruco/aruco_calib.hpp

@@ -26,7 +26,7 @@ enum PatternPositionType {
      * (markerLength/2, -markerLength/2, 0), (-markerLength/2, -markerLength/2, 0).
      *
      * These pattern points define this coordinate system:
-     * ![Image with axes drawn](tutorials/images/singlemarkersaxes.jpg)
+     * ![Image with axes drawn](tutorials/images/singlemarkersaxes2.jpg)
      */
     ARUCO_CCW_CENTER,
     /** @brief The marker coordinate system is centered on the top-left corner of the marker.
@@ -36,7 +36,7 @@ enum PatternPositionType {
      * (markerLength, markerLength, 0), (0, markerLength, 0).
      *
      * These pattern points define this coordinate system:
-     * ![Image with axes drawn](tutorials/images/singlemarkersaxes2.jpg)
+     * ![Image with axes drawn](tutorials/images/singlemarkersaxes.jpg)
      *
      * These pattern dots are convenient to use with a chessboard/ChArUco board.
      */