Merge branch 'shimat:main' into patch-2

shimat · Aug 11, 2023 · 4430de1 · 4430de1
2 parents 532cbec + 15d3947
commit 4430de1
Show file tree

Hide file tree

Showing 111 changed files with 2,103 additions and 1,144 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:
@@ -23,7 +23,7 @@ jobs:
           dotnet-version: 6.0.x
 
       - name: Setup MSBuild.exe
-        uses: microsoft/[email protected]
+        uses: microsoft/setup-msbuild@v1.3.1
 
       - name: DocFX
         shell: cmd
@@ -37,7 +37,7 @@ jobs:
           name: docfx_site
           path: ${{ github.workspace }}\docfx\_site
 
-      - uses: actions/upload-pages-artifact@v1
+      - uses: actions/upload-pages-artifact@v2
         with:
           path: docfx/_site
 
@@ -53,4 +53,4 @@ jobs:
    steps:
      - name: Deploy to GitHub Pages
        id: deployment
-       uses: actions/deploy-pages@v1
+       uses: actions/deploy-pages@v2
diff --git a/.github/workflows/docker-ubuntu20.yml b/.github/workflows/docker-ubuntu20.yml
@@ -13,9 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
+      - uses: actions/checkout@v3
 
       - name: docker build
         run: |

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,18 +5,18 @@ on:
     types: [synchronize, opened]
   push:
     branches:
-      - master
+      - main
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.7.0
-  EM_VERSION: 2.0.23
+  OPENCV_VERSION: 4.8.0
+  EM_VERSION: 3.1.32
   EM_CACHE_FOLDER: 'emsdk-cache'
 
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3
@@ -35,24 +35,23 @@ jobs:
             wget \
             unzip \
             ca-certificates \
-            build-essential \
+            g++ \
+            make \
             cmake \
-            git \
             libtbb-dev \
             libatlas-base-dev \
             libgtk2.0-dev \
             libavcodec-dev \
             libavformat-dev \
             libswscale-dev \
-            libdc1394-22-dev \
+            libdc1394-dev \
             libxine2-dev \
             libv4l-dev \
             libtheora-dev \
             libvorbis-dev \
             libxvidcore-dev \
             libopencore-amrnb-dev \
             libopencore-amrwb-dev \
-            libavresample-dev \
             x264 \
             libtesseract-dev 
 
@@ -65,7 +64,7 @@ jobs:
 
       - name: Setup Emscripten cache
         id: cache-system-libraries
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{env.EM_CACHE_FOLDER}}
           key: ${{env.EM_VERSION}}-${{ runner.os }}

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