From 29dcd46d609d5d2a4ae8b6f7d98a4eba5309e161 Mon Sep 17 00:00:00 2001
From: benjaminwan <benjaminwan@163.com>
Date: Sun, 21 Jul 2024 10:36:17 +0800
Subject: [PATCH] 3.4.18

---
 .github/workflows/android.yml  | 2 +-
 .github/workflows/linux.yml    | 2 +-
 .github/workflows/macos.yml    | 2 +-
 .github/workflows/musl-gcc.yml | 2 +-
 .github/workflows/musl-zig.yml | 2 +-
 .github/workflows/windows.yml  | 2 +-
 README.md                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 009bcc6..3bf172c 100644
--- 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
index d02f57f..f7b37e8 100644
--- 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
index 0a20837..8242d67 100644
--- 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
index 682ab0b..1576e01 100644
--- 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
index 6eed189..1247f92 100644
--- 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
index 2c693b6..242405a 100644
--- 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
index 24d623c..b644447 100644
--- a/README.md
+++ b/README.md
@@ -70,4 +70,4 @@ OpenCV在OCR中只是做图像的读取保存、编解码、缩放等，可以
 
 ## 其它说明
 
-- 从3.4.17开始修改WITH_OPENCL=ON
\ No newline at end of file
+- 3.4.17 Windows WITH_OPENCL=ON, for opencv-rust
\ No newline at end of file