Merge branch '5.x' into simpleCaffeModel2onnx

opencv · May 17, 2024 · 1fc0bba · 1fc0bba
2 parents 1c68538 + 9238eb2
commit 1fc0bba
Show file tree

Hide file tree

Showing 129 changed files with 1,772 additions and 38,328 deletions.
diff --git a/.github/workflows/PR-5.x.yaml b/.github/workflows/PR-5.x.yaml
@@ -15,6 +15,9 @@ jobs:
   Ubuntu2004-x64:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-U20.yaml@main
 
+  Ubuntu2004-x64-OpenVINO:
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml@main
+
   Ubuntu2204-x64:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-U22.yaml@main
 

diff --git a/3rdparty/libjpeg/CMakeLists.txt b/3rdparty/libjpeg/CMakeLists.txt
diff --git a/3rdparty/libjpeg/README b/3rdparty/libjpeg/README