Skip to content

Commit 679375f

Browse files
shimatshimat
authored
Merge branch 'master' into master
2 parents 4ed5114 + 809dc9f commit 679375f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1137
-231
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66

77
environment:
88
DEBIAN_FRONTEND: noninteractive
9-
OPENCV_VERSION: 4.3.0
9+
OPENCV_VERSION: 4.4.0
1010

1111
steps:
1212
- checkout
@@ -27,7 +27,7 @@ jobs:
2727
2828
- restore_cache:
2929
keys:
30-
- opencv-v4.3.0_rev1
30+
- opencv-v4.4.0_rev1
3131

3232
- run:
3333
name: Download OpenCV source code
@@ -56,7 +56,7 @@ jobs:
5656
ls /root/project/opencv_ubuntu/lib
5757
5858
- save_cache:
59-
key: opencv-v4.3.0_rev1
59+
key: opencv-v4.4.0_rev1
6060
paths:
6161
- /root/project/opencv_ubuntu
6262

‎.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Summary of your issue
22

3+
<!-- Please refrain from posting issues other than those related to the WRAPPERS. Please look up the native OpenCV information. -->
4+
35
# Environment
46

57
Write your environment.

‎.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 180
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

‎.github/workflows/macos10.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on: [push]
44

55
env:
66
DEBIAN_FRONTEND: noninteractive
7-
OPENCV_VERSION: 4.3.0
7+
OPENCV_VERSION: 4.4.0
88

99
jobs:
1010
build:
1111

12-
runs-on: macos
12+
runs-on: macos-10.15
1313

1414
steps:
1515
- uses: actions/checkout@v1
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/cache@v1
2626
with:
2727
path: opencv_macos/
28-
key: opencv-4.3.0-macos-rev3
28+
key: opencv-4.4.0-macos-rev1
2929

3030
- name: Build OpenCV
3131
if: steps.opencv-cache.outputs.cache-hit != 'true'

‎.github/workflows/ubuntu18.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
env:
66
DEBIAN_FRONTEND: noninteractive
7-
OPENCV_VERSION: 4.3.0
7+
OPENCV_VERSION: 4.4.0
88

99
jobs:
1010
build:
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/cache@v1
3636
with:
3737
path: /home/runner/work/opencvsharp/opencvsharp/opencv_ubuntu/
38-
key: opencv-4.3.0-rev1
38+
key: opencv-4.4.0-rev1
3939

4040
- name: Build OpenCV
4141
if: steps.opencv-cache.outputs.cache-hit != 'true'

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,4 @@ UpgradeLog*.XML
123123
/test/OpenCvSharp.Tests/dll/x86/*.dll
124124
/test/OpenCvSharp.Tests/*.dll
125125
Help
126+
/tesseract_files

‎OpenCvSharp.sln

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCvSharp.NupkgBetaRemove
3030
EndProject
3131
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uwpOpenCvSharpExtern", "src\uwpOpenCvSharpExtern\uwpOpenCvSharpExtern.vcxproj", "{BD5471E5-7B55-5192-8DA4-042B66AF71AE}"
3232
EndProject
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCvSharp.WpfExtensions", "src\OpenCvSharp.WpfExtensions\OpenCvSharp.WpfExtensions.csproj", "{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}"
34+
EndProject
3335
Global
3436
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3537
Debug|Any CPU = Debug|Any CPU
@@ -329,6 +331,38 @@ Global
329331
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x64.Build.0 = Release|x64
330332
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x86.ActiveCfg = Release|Win32
331333
{BD5471E5-7B55-5192-8DA4-042B66AF71AE}.Release-JP|x86.Build.0 = Release|Win32
334+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
335+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
336+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|ARM.ActiveCfg = Debug|Any CPU
337+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|ARM.Build.0 = Debug|Any CPU
338+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|x64.ActiveCfg = Debug|Any CPU
339+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|x64.Build.0 = Debug|Any CPU
340+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|x86.ActiveCfg = Debug|Any CPU
341+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Debug|x86.Build.0 = Debug|Any CPU
342+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|Any CPU.ActiveCfg = Debug|Any CPU
343+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|Any CPU.Build.0 = Debug|Any CPU
344+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|ARM.ActiveCfg = Debug|Any CPU
345+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|ARM.Build.0 = Debug|Any CPU
346+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|x64.ActiveCfg = Debug|Any CPU
347+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|x64.Build.0 = Debug|Any CPU
348+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|x86.ActiveCfg = Debug|Any CPU
349+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.FxCop|x86.Build.0 = Debug|Any CPU
350+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
351+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|Any CPU.Build.0 = Release|Any CPU
352+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|ARM.ActiveCfg = Release|Any CPU
353+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|ARM.Build.0 = Release|Any CPU
354+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x64.ActiveCfg = Release|Any CPU
355+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x64.Build.0 = Release|Any CPU
356+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x86.ActiveCfg = Release|Any CPU
357+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release|x86.Build.0 = Release|Any CPU
358+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|Any CPU.ActiveCfg = Release|Any CPU
359+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|Any CPU.Build.0 = Release|Any CPU
360+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|ARM.ActiveCfg = Release|Any CPU
361+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|ARM.Build.0 = Release|Any CPU
362+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x64.ActiveCfg = Release|Any CPU
363+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x64.Build.0 = Release|Any CPU
364+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x86.ActiveCfg = Release|Any CPU
365+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5}.Release-JP|x86.Build.0 = Release|Any CPU
332366
EndGlobalSection
333367
GlobalSection(SolutionProperties) = preSolution
334368
HideSolutionNode = FALSE
@@ -343,6 +377,7 @@ Global
343377
{E2C8C528-B7C7-40AF-BB7F-1147A41E2E23} = {A6E578C0-A34A-4CCF-A808-CBAC81CB48C0}
344378
{CC19F9A5-01A7-4BDF-B34C-CF56F46A474A} = {A6E578C0-A34A-4CCF-A808-CBAC81CB48C0}
345379
{BD5471E5-7B55-5192-8DA4-042B66AF71AE} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
380+
{01FD66CE-F81A-4641-BE30-3CF9DE84D6D5} = {E048D213-B3B9-453F-9A41-29FDEB0D496B}
346381
EndGlobalSection
347382
GlobalSection(ExtensibilityGlobals) = postSolution
348383
SolutionGuid = {60DD551B-ED40-447E-AABE-B408178D29D1}

‎README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenCvSharp [![CircleCI Status](https://circleci.com/gh/shimat/opencvsharp/tree/master.svg?style=svg)](https://circleci.com/gh/shimat/opencvsharp/tree/master) [![Appveyor Build status](https://ci.appveyor.com/api/projects/status/dvjexft02s6b3re6/branch/master?svg=true)](https://ci.appveyor.com/project/shimat/opencvsharp/branch/master) [![Github Actions Ubuntu Status](https://github.com/shimat/opencvsharp/workflows/Ubuntu%2018.04/badge.svg)](https://github.com/shimat/opencvsharp/actions) [![Github Actions MacOS Status](https://github.com/shimat/opencvsharp/workflows/macOS%2010.15/badge.svg)](https://github.com/shimat/opencvsharp/actions) [![GitHub license](https://img.shields.io/github/license/shimat/opencvsharp.svg)](https://github.com/shimat/opencvsharp/blob/master/LICENSE)
22

3-
Cross platform wrapper of OpenCV for .NET Framework.
3+
Wrapper of OpenCV for .NET
44

55
Old versions of OpenCvSharp are stored in [opencvsharp_2410](https://github.com/shimat/opencvsharp_2410).
66

@@ -47,10 +47,10 @@ Add `OpenCvSharp4` and `OpenCvSharp4.runtime.ubuntu.16.04.x64 (beta)` NuGet pack
4747
If you do not use NuGet, get DLL files from the [release page](https://github.com/shimat/opencvsharp/releases).
4848

4949
## Target OpenCV
50-
* [OpenCV 4.3.0](http://opencv.org/) with [opencv_contrib](https://github.com/opencv/opencv_contrib)
50+
* [OpenCV 4.4.0](http://opencv.org/) with [opencv_contrib](https://github.com/opencv/opencv_contrib)
5151

5252
## Requirements
53-
* [.NET Framework 4.6.1](http://www.microsoft.com/ja-jp/download/details.aspx?id=1639) or later / [.NET Core 2.0](https://www.microsoft.com/net/download) / [Mono](http://www.mono-project.com/Main_Page)
53+
* [.NET Framework 4.6.1](http://www.microsoft.com/ja-jp/download/details.aspx?id=1639) / [.NET Core 2.0](https://www.microsoft.com/net/download) / [Mono](http://www.mono-project.com/Main_Page)
5454
* (Windows) [Visual C++ 2019 Redistributable Package](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
5555
* (Windows Server) Media Foundation
5656
```
@@ -60,22 +60,22 @@ PS1> Install-WindowsFeature Server-Media-Foundation
6060
https://www.learnopencv.com/install-opencv-4-on-ubuntu-18-04/
6161

6262

63-
OpenCvSharp may not work on Unity platform. Please consider using [OpenCV for Unity](https://www.assetstore.unity3d.com/en/#!/content/21088)
63+
**OpenCvSharp won't work on Unity and Xamarin platform.** For Unity, please consider using [OpenCV for Unity](https://www.assetstore.unity3d.com/en/#!/content/21088) or some other solutions.
6464

6565
## Usage
6666
For more details, see **[samples](https://github.com/shimat/opencvsharp_samples/)** and **[Wiki](https://github.com/shimat/opencvsharp/wiki)** pages.
6767

6868
```C#
69+
// C# 8
6970
// Edge detection by Canny algorithm
7071
using OpenCvSharp;
7172

7273
class Program
7374
{
7475
static void Main()
7576
{
76-
Mat src = new Mat("lenna.png", ImreadModes.Grayscale);
77-
       // Mat src = Cv2.ImRead("lenna.png", ImreadModes.Grayscale);
78-
       Mat dst = new Mat();
77+
using var src = new Mat("lenna.png", ImreadModes.Grayscale);
78+
       using var dst = new Mat();
7979

8080
Cv2.Canny(src, dst, 50, 200);
8181
using (new Window("src image", src))
@@ -158,9 +158,6 @@ Refer to the [Dockerfile](https://github.com/shimat/opencvsharp/blob/master/dock
158158
## License
159159
Licensed under the [BSD 3-Clause License](https://github.com/shimat/opencvsharp/blob/master/LICENSE).
160160

161-
## Chat
162-
https://riot.im/app/#/room/#opencvsharp:matrix.org
163-
164161
## Donations
165162

166163
If you find the OpenCvSharp library useful and would like to show your gratitude by donating, here are some donation options. Thank you.

‎appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '4.3.0-{build}'
1+
version: '4.4.0-{build}'
22

33
#environment:
44
# APPVEYOR_SAVE_CACHE_ON_ERROR: false
@@ -74,9 +74,12 @@ before_build:
7474
# - cmd: git submodule update --init --recursive
7575
- cmd: nuget restore
7676
# - cmd: vcpkg install tesseract:x64-windows-static tesseract:x86-windows-static
77+
# - cmd: vcpkg integrate install
78+
- cmd: vcpkg integrate remove
7779
- ps: |
7880
Install-WindowsFeature Server-Media-Foundation
7981
. ".\download_opencv_windows.ps1"
82+
. ".\download_tesseract_windows.ps1"
8083
8184
build_script:
8285
- cmd: msbuild OpenCvSharp.sln /t:build /p:configuration=%CONFIGURATION% /p:platform=x64 -maxcpucount
@@ -104,6 +107,7 @@ after_build:
104107
105108
nuget pack nuget/OpenCvSharp4.nuspec -OutputDirectory artifacts -Symbols -SymbolPackageFormat snupkg
106109
nuget pack nuget/OpenCvSharp4.Windows.nuspec -OutputDirectory artifacts
110+
nuget pack nuget/OpenCvSharp4.WpfExtensions.nuspec -OutputDirectory artifacts -Symbols -SymbolPackageFormat snupkg
107111
nuget pack nuget/OpenCvSharp4.runtime.win.nuspec -OutputDirectory artifacts
108112
nuget pack nuget/OpenCvSharp4.runtime.uwp.nuspec -OutputDirectory artifacts
109113

‎docker/ubuntu.18.04-x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:18.04 AS build-native-env
22

3-
ENV OPENCV_VERSION=4.3.0
3+
ENV OPENCV_VERSION=4.4.0
44

55
RUN apt-get update && apt-get install -y \
66
apt-transport-https \

0 commit comments

Comments
 (0)