Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

4.8 #1590

Merged
merged 14 commits into from
Jul 11, 2023
Merged

4.8 #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c556dbb
4.8
shimat Jul 5, 2023
0182a6f
update config files
shimat Jul 5, 2023
467f827
fix nuget
shimat Jul 6, 2023
99d4d20
imageinfo
shimat Jul 6, 2023
79853ae
fix Tests
shimat Jul 6, 2023
fef1589
remove debug code
shimat Jul 6, 2023
c819db3
remove netcoreapp3.1
shimat Jul 6, 2023
e62a730
remove netcoreapp3.1
shimat Jul 7, 2023
da9a742
remove beta
shimat Jul 7, 2023
535f71d
Merge remote-tracking branch 'remotes/origin/main' into 4.8
shimat Jul 8, 2023
cbb4229
fix warnings
shimat Jul 8, 2023
5c8587c
update docker files
shimat Jul 8, 2023
66b8e3e
update samples
shimat Jul 10, 2023
7b56503
main
shimat Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docfx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: DocFX
on:
push:
branches:
- master
- main
workflow_dispatch:

jobs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos10.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish_nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu20.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions OpenCvSharp.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
148 changes: 0 additions & 148 deletions docker/ubuntu18-dotnetcore3.1-opencv4.5.3/Dockerfile
View file
Open in desktop

This file was deleted.

Loading
Loading