Merge pull request #1590 from shimat/4.8

4.8
shimat · Jul 11, 2023 · f3072f6 · f3072f6
2 parents dd6be1a + 7b56503
commit f3072f6
Show file tree

Hide file tree

Showing 97 changed files with 717 additions and 1,105 deletions.
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -3,7 +3,7 @@ name: DocFX
 on:
  push:
  branches:
- - master
+ - main
  workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
@@ -5,11 +5,11 @@ on:
  types: [synchronize, opened]
  push:
  branches:
- - master
+ - main
 
 env:
  DEBIAN_FRONTEND: noninteractive
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
 
 jobs:
  build:
@@ -31,7 +31,7 @@ jobs:
  --output=type=docker \
  --platform=linux/arm/v7 \
  --build-arg OPENCV_VERSION \
- ./docker/ubuntu22-dotnet6-opencv4.7.0
+ ./docker/ubuntu22-dotnet6-opencv4.8.0
 
  - name: Extract build files from Docker instance
  run: |

diff --git a/.github/workflows/macos10.yml.disabled b/.github/workflows/macos10.yml.disabled
@@ -5,11 +5,11 @@ on:
  types: [synchronize, opened]
  push:
  branches:
- - master
+ - main
 
 env:
  DEBIAN_FRONTEND: noninteractive
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
 
 jobs:
  build:

diff --git a/.github/workflows/publish_nuget.yml b/.github/workflows/publish_nuget.yml
@@ -31,12 +31,12 @@ jobs:
  workflow: linux-arm.yml
  name: artifacts_linux_arm
 
- - name: Download macos artifact
- uses: dawidd6/action-download-artifact@v2
- with:
- github_token: ${{secrets.GITHUB_TOKEN}}
- workflow: macos10.yml
- name: artifacts_macos_10
+ #- name: Download macos artifact
+ # uses: dawidd6/action-download-artifact@v2
+ # with:
+ # github_token: ${{secrets.GITHUB_TOKEN}}
+ # workflow: macos10.yml
+ # name: artifacts_macos_10
 
  - name: Download wasm artifact
  uses: dawidd6/action-download-artifact@v2

diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml
@@ -5,11 +5,11 @@ on:
  types: [synchronize, opened]
  push:
  branches:
- - master
+ - main
 
 env:
  DEBIAN_FRONTEND: noninteractive
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
  OPENCV_CACHE_VERSION: 1
 
 jobs:

diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -5,11 +5,11 @@ on:
  types: [synchronize, opened]
  push:
  branches:
- - master
+ - main
 
 env:
  DEBIAN_FRONTEND: noninteractive
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
  EM_VERSION: 3.1.32
  EM_CACHE_FOLDER: 'emsdk-cache'
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -5,10 +5,10 @@ on:
  types: [synchronize, opened]
  push:
  branches:
- - master
+ - main
 
 env:
- OPENCV_VERSION: 4.7.0
+ OPENCV_VERSION: 4.8.0
 
 jobs:
  build:

diff --git a/OpenCvSharp.sln.DotSettings b/OpenCvSharp.sln.DotSettings
@@ -64,7 +64,9 @@
  <s:Boolean x:Key="/Default/UserDictionary/Words/=imgproc/@EntryIndexedValue">True</s:Boolean>
 
  <s:Boolean x:Key="/Default/UserDictionary/Words/=imread/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=imreadmulti/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=imshow/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=imwrite/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=inlier/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=inliers/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=inliners/@EntryIndexedValue">True</s:Boolean>
@@ -88,6 +90,7 @@
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Mersenne/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Mertens/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=MSER/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=multipage/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=ndims/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=neighbourhood/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=neighbouring/@EntryIndexedValue">True</s:Boolean>
@@ -134,6 +137,7 @@
  <s:Boolean x:Key="/Default/UserDictionary/Words/=uchar/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=umat/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Undistort/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=unmappable/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Vecs/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=videoio/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Voronoi/@EntryIndexedValue">True</s:Boolean>

diff --git a/docker/ubuntu18-dotnetcore3.1-opencv4.5.3/Dockerfile b/docker/ubuntu18-dotnetcore3.1-opencv4.5.3/Dockerfile