3.4.18

RapidAI · Jul 21, 2024 · 29dcd46 · 29dcd46
1 parent 3975d0c
commit 29dcd46
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.17, ndk: 25.2.9519653 }
+          - { cv: 3.4.18, ndk: 25.2.9519653 }
 
     env:
       BUILD_SCRIPT: build-opencv3-android.sh

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         os_name: [ubuntu]
         ver:
-          - { cv: 3.4.17, cmake: 3.28.6, python: 3.8.19, ant: 1.10.14, jdk: openjdk-8-jdk }
+          - { cv: 3.4.18, cmake: 3.28.6, python: 3.8.19, ant: 1.10.14, jdk: openjdk-8-jdk }
         list:
           - { os_ver: 14.04, os_id: trusty }
           - { os_ver: 16.04, os_id: xenial }

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.17, ant: 1.10.14 }
+          - { cv: 3.4.18, ant: 1.10.14 }
         list:
           - { os_ver: 12, java: 8 }
           - { os_ver: 13, java: 8 }

diff --git a/.github/workflows/musl-gcc.yml b/.github/workflows/musl-gcc.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.17, musl: 11.4.0 }
+          - { cv: 3.4.18, musl: 11.4.0 }
         arch:
           [
             aarch64-linux-musl,

diff --git a/.github/workflows/musl-zig.yml b/.github/workflows/musl-zig.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.17, zig: zig-linux-x86_64-0.13.0 }
+          - { cv: 3.4.18, zig: zig-linux-x86_64-0.13.0 }
         target:
           [
             aarch64_be-linux-musl,

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         ver:
-          - { cv: 3.4.17, jdk: 8, ant: 1.10.14 }
+          - { cv: 3.4.18, jdk: 8, ant: 1.10.14 }
         list:
           - { win_ver: 2019, vs_name: vs2015, vs_ver: v140 }
           - { win_ver: 2019, vs_name: vs2017, vs_ver: v141 }

diff --git a/README.md b/README.md
@@ -70,4 +70,4 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等，可以
 
 ## 其它说明
 
-- 从3.4.17开始修改WITH_OPENCL=ON
+- 3.4.17 Windows WITH_OPENCL=ON, for opencv-rust
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,4 +70,4 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等，可以

		## 其它说明

		- 从3.4.17开始修改WITH_OPENCL=ON
		- 3.4.17 Windows WITH_OPENCL=ON, for opencv-rust