Skip to content

Commit a2c1aa3

Browse files
shimatshimat
authored
Merge pull request shimat#571 from shimat/3.4.3
3.4.4
2 parents b2be595 + 9f9d4a9 commit a2c1aa3

File tree

77 files changed

+363
-764
lines changed

Some content is hidden

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

77 files changed

+363
-764
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,3 @@ UpgradeLog*.XML
123123
/nuget/*.nupkg
124124
/Help
125125
/myresults.xml
126-
/test/OpenCvSharp.Tests/_data/tessdata

‎.gitmodules

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[submodule "samples"]
22
path = samples
33
url = https://github.com/shimat/opencvsharp_samples.git
4-
[submodule "tesseract"]
5-
path = tesseract
6-
url = https://github.com/shimat/VS2015_Tesseract
7-
[submodule "opencv_files_341"]
8-
path = opencv_files_341
9-
url = https://github.com/shimat/opencv_files_341
4+
[submodule "opencv_files_344"]
5+
path = opencv_files_344
6+
url = https://github.com/shimat/opencv_files_344

‎OpenCvSharp.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ Global
133133
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|x64.ActiveCfg = Release|x64
134134
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|x64.Build.0 = Release|x64
135135
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|x86.ActiveCfg = Debug|Win32
136-
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Debug|x86.Build.0 = Debug|Win32
137136
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|Any CPU.ActiveCfg = Release|x64
138137
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|Any CPU.Build.0 = Release|x64
139138
{8E7279F8-F801-4672-B42F-1ED2C68B16A4}.Release|x64.ActiveCfg = Release|x64

‎appveyor.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '3.4.1-{build}'
1+
version: '3.4.4-{build}'
22

33
init:
44
- ps: |
@@ -53,14 +53,22 @@ image: Visual Studio 2017
5353

5454
configuration: Release
5555

56-
before_build:
57-
- git submodule update --init --recursive
58-
#- git submodule update --init
56+
cache:
57+
- c:\tools\vcpkg\installed\
58+
#- c:\tools\vcpkg\installed\ -> appveyor.yml
59+
- packages -> **\packages.config
5960

61+
install:
6062
# build tesseract
61-
- msbuild tesseract/tesseract.sln /t:build /p:configuration=%CONFIGURATION% /p:platform=x64
62-
- msbuild tesseract/tesseract.sln /t:build /p:configuration=%CONFIGURATION% /p:platform=x86
63+
- cd c:\tools\vcpkg
64+
- vcpkg integrate install
65+
- vcpkg install tesseract:x64-windows-static
66+
- vcpkg install tesseract:x86-windows-static
67+
- cd %APPVEYOR_BUILD_FOLDER%
68+
- vcpkg list
6369

70+
before_build:
71+
- git submodule update --init --recursive
6472
- nuget restore
6573
#- dotnet restore
6674

@@ -79,9 +87,6 @@ after_build:
7987
nuget pack nuget/OpenCvSharp3-WithoutDll.nuspec -OutputDirectory artifacts
8088
8189
test_script:
82-
#- nunit3-console.exe ./test/OpenCvSharp.Tests/bin/Release/net461/OpenCvSharp.Tests.dll --result=myresults.xml;format=AppVeyor
83-
# https://www.appveyor.com/docs/running-tests/#nunit-3x
84-
#- xunit.console ./test/OpenCvSharp.Tests/bin/Release/net461/OpenCvSharp.Tests.dll /appveyor
8590
- dotnet test ./test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj --no-build
8691

8792

‎nuget/OpenCvSharp3-AnyCPU.nuspec

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-AnyCPU</id>
5-
<version>3.4.1.20180312-beta</version>
5+
<version>3.4.4.20181118-beta</version>
66
<title>OpenCvSharp3</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
@@ -13,30 +13,29 @@
1313
<summary>OpenCV 3.x wrapper</summary>
1414
<releaseNotes></releaseNotes>
1515
<copyright>Copyright 2008-2018</copyright>
16-
<tags>Image Processing OpenCV Wrapper FFI</tags>
16+
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
17+
<!--<minClientVersion>3.3</minClientVersion>-->
1718
<dependencies>
1819
<group targetFramework="net20" />
1920
<group targetFramework="net40" />
20-
<group targetFramework="net46" />
21+
<group targetFramework="net461" />
2122
<group targetFramework="netstandard2.0">
2223
<dependency id="System.Drawing.Common" version="4.5.0" />
2324
</group>
2425
</dependencies>
2526
<frameworkAssemblies>
26-
<frameworkAssembly assemblyName="System.Security" targetFramework="net20, net40, net46" />
27-
<frameworkAssembly assemblyName="System.Web" targetFramework="net20, net40, net46" />
28-
<frameworkAssembly assemblyName="System.Drawing" targetFramework="net20, net40, net46" />
29-
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework="net20, net40, net46" />
30-
<frameworkAssembly assemblyName="PresentationCore" targetFramework="net40, net46" />
31-
<frameworkAssembly assemblyName="PresentationFramework" targetFramework="net40, net46" />
32-
<frameworkAssembly assemblyName="System.Core" targetFramework="net40, net46" />
33-
<frameworkAssembly assemblyName="WindowsBase" targetFramework="net40, net46" />
34-
<frameworkAssembly assemblyName="System.Xaml" targetFramework="net40, net46" />
27+
<frameworkAssembly assemblyName="System.Security" targetFramework="net20, net40, net461" />
28+
<frameworkAssembly assemblyName="System.Web" targetFramework="net20, net40, net461" />
29+
<frameworkAssembly assemblyName="System.Drawing" targetFramework="net20, net40, net461" />
30+
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework="net20, net40, net461" />
31+
<frameworkAssembly assemblyName="PresentationCore" targetFramework="net40, net461" />
32+
<frameworkAssembly assemblyName="PresentationFramework" targetFramework="net40, net461" />
33+
<frameworkAssembly assemblyName="System.Core" targetFramework="net40, net461" />
34+
<frameworkAssembly assemblyName="WindowsBase" targetFramework="net40, net461" />
35+
<frameworkAssembly assemblyName="System.Xaml" targetFramework="net40, net461" />
3536
</frameworkAssemblies>
3637
</metadata>
3738
<files>
38-
<file src="OpenCvSharp3-AnyCPU.props" target="build\OpenCvSharp3-AnyCPU.props" />
39-
4039
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.dll" target="lib\net20" />
4140
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.pdb" target="lib\net20" />
4241
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.xml" target="lib\net20" />
@@ -57,18 +56,18 @@
5756
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net40\OpenCvSharp.UserInterface.pdb" target="lib\net40" />
5857
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net40\OpenCvSharp.UserInterface.xml" target="lib\net40" />
5958

60-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.dll" target="lib\net46" />
61-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.xml" target="lib\net46" />
62-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.pdb" target="lib\net46" />
63-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.dll" target="lib\net46" />
64-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.pdb" target="lib\net46" />
65-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.xml" target="lib\net46" />
66-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.dll" target="lib\net46" />
67-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.pdb" target="lib\net46" />
68-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.xml" target="lib\net46" />
69-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.dll" target="lib\net46" />
70-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.pdb" target="lib\net46" />
71-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.xml" target="lib\net46" />
59+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.dll" target="lib\net461" />
60+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.xml" target="lib\net461" />
61+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.pdb" target="lib\net461" />
62+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.dll" target="lib\net461" />
63+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.pdb" target="lib\net461" />
64+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.xml" target="lib\net461" />
65+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.dll" target="lib\net461" />
66+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.pdb" target="lib\net461" />
67+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.xml" target="lib\net461" />
68+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.dll" target="lib\net461" />
69+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.pdb" target="lib\net461" />
70+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.xml" target="lib\net461" />
7271

7372
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.dll" target="lib\netstandard2.0" />
7473
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.pdb" target="lib\netstandard2.0" />
@@ -80,10 +79,11 @@
8079
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.pdb" target="lib\netstandard2.0" />
8180
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.xml" target="lib\netstandard2.0" />
8281

83-
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
84-
<file src="..\opencv_files_341\x64\vc15\bin\opencv_ffmpeg341_64.dll" target="NativeDlls\x64\opencv_ffmpeg341_64.dll" />
85-
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
86-
<file src="..\opencv_files_341\x86\vc15\bin\opencv_ffmpeg341.dll" target="NativeDlls\x86\opencv_ffmpeg341.dll" />
82+
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win10-x64\native" />
83+
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win10-x86\native" />
84+
<file src="..\opencv_files_344\lib\x64\vc15\bin\opencv_ffmpeg344_64.dll" target="runtimes\win10-x64\native" />
85+
<file src="..\opencv_files_344\lib\x86\vc15\bin\opencv_ffmpeg344.dll" target="runtimes\win10-x86\native" />
86+
<file src="OpenCvSharp3-AnyCPU.props" target="build\OpenCvSharp3-AnyCPU.props" />
8787

8888
<!--<file src="tools\init.ps1" target="tools\init.ps1" />
8989
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />-->

‎nuget/OpenCvSharp3-AnyCPU.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<NativeDlls>$(MSBuildThisFileDirectory)\..\NativeDlls</NativeDlls>
3+
<NativeDlls>$(MSBuildThisFileDirectory)..\runtimes</NativeDlls>
44
</PropertyGroup>
55
<ItemGroup>
6-
<None Include="$(NativeDlls)\x86\OpenCvSharpExtern.dll">
6+
<None Include="$(NativeDlls)\win10-x86\native\OpenCvSharpExtern.dll">
77
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99
</None>
10-
<None Include="$(NativeDlls)\x86\opencv_ffmpeg341.dll">
11-
<Link>dll\x86\opencv_ffmpeg341.dll</Link>
10+
<None Include="$(NativeDlls)\win10-x86\native\opencv_ffmpeg344.dll">
11+
<Link>dll\x86\opencv_ffmpeg344.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</None>
1414
</ItemGroup>
1515
<ItemGroup>
16-
<None Include="$(NativeDlls)\x64\OpenCvSharpExtern.dll">
16+
<None Include="$(NativeDlls)\win10-x64\native\OpenCvSharpExtern.dll">
1717
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Include="$(NativeDlls)\x64\opencv_ffmpeg341_64.dll">
21-
<Link>dll\x64\opencv_ffmpeg341_64.dll</Link>
20+
<None Include="$(NativeDlls)\win10-x64\native\opencv_ffmpeg344_64.dll">
21+
<Link>dll\x64\opencv_ffmpeg344_64.dll</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
2424
</ItemGroup>

‎nuget/OpenCvSharp3-WithoutDll.nuspec

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-WithoutDll</id>
5-
<version>3.4.1.20180312-beta</version>
5+
<version>3.4.4.20181114-beta</version>
66
<title>OpenCvSharp3 (without DLLs)</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
@@ -13,25 +13,25 @@
1313
<summary>OpenCV 3.x wrapper</summary>
1414
<releaseNotes></releaseNotes>
1515
<copyright>Copyright 2008-2017</copyright>
16-
<tags>Image Processing OpenCV Wrapper FFI</tags>
16+
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
1717
<dependencies>
1818
<group targetFramework="net20" />
1919
<group targetFramework="net40" />
20-
<group targetFramework="net46" />
20+
<group targetFramework="net461" />
2121
<group targetFramework="netstandard2.0">
2222
<dependency id="System.Drawing.Common" version="4.5.0" />
2323
</group>
2424
</dependencies>
2525
<frameworkAssemblies>
26-
<frameworkAssembly assemblyName="System.Security" targetFramework="net20, net40, net46" />
27-
<frameworkAssembly assemblyName="System.Web" targetFramework="net20, net40, net46" />
28-
<frameworkAssembly assemblyName="System.Drawing" targetFramework="net20, net40, net46" />
29-
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework="net20, net40, net46" />
30-
<frameworkAssembly assemblyName="PresentationCore" targetFramework="net40, net46" />
31-
<frameworkAssembly assemblyName="PresentationFramework" targetFramework="net40, net46" />
32-
<frameworkAssembly assemblyName="System.Core" targetFramework="net40, net46" />
33-
<frameworkAssembly assemblyName="WindowsBase" targetFramework="net40, net46" />
34-
<frameworkAssembly assemblyName="System.Xaml" targetFramework="net40, net46" />
26+
<frameworkAssembly assemblyName="System.Security" targetFramework="net20, net40, net461" />
27+
<frameworkAssembly assemblyName="System.Web" targetFramework="net20, net40, net461" />
28+
<frameworkAssembly assemblyName="System.Drawing" targetFramework="net20, net40, net461" />
29+
<frameworkAssembly assemblyName="System.Windows.Forms" targetFramework="net20, net40, net461" />
30+
<frameworkAssembly assemblyName="PresentationCore" targetFramework="net40, net461" />
31+
<frameworkAssembly assemblyName="PresentationFramework" targetFramework="net40, net461" />
32+
<frameworkAssembly assemblyName="System.Core" targetFramework="net40, net461" />
33+
<frameworkAssembly assemblyName="WindowsBase" targetFramework="net40, net461" />
34+
<frameworkAssembly assemblyName="System.Xaml" targetFramework="net40, net461" />
3535
</frameworkAssemblies>
3636
</metadata>
3737
<files>
@@ -55,18 +55,18 @@
5555
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net40\OpenCvSharp.UserInterface.pdb" target="lib\net40" />
5656
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net40\OpenCvSharp.UserInterface.xml" target="lib\net40" />
5757

58-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.dll" target="lib\net46" />
59-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.xml" target="lib\net46" />
60-
<file src="..\src\OpenCvSharp\bin\Release\net46\OpenCvSharp.pdb" target="lib\net46" />
61-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.dll" target="lib\net46" />
62-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.pdb" target="lib\net46" />
63-
<file src="..\src\OpenCvSharp.Blob\bin\Release\net46\OpenCvSharp.Blob.xml" target="lib\net46" />
64-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.dll" target="lib\net46" />
65-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.pdb" target="lib\net46" />
66-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net46\OpenCvSharp.Extensions.xml" target="lib\net46" />
67-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.dll" target="lib\net46" />
68-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.pdb" target="lib\net46" />
69-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net46\OpenCvSharp.UserInterface.xml" target="lib\net46" />
58+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.dll" target="lib\net461" />
59+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.xml" target="lib\net461" />
60+
<file src="..\src\OpenCvSharp\bin\Release\net461\OpenCvSharp.pdb" target="lib\net461" />
61+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.dll" target="lib\net461" />
62+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.pdb" target="lib\net461" />
63+
<file src="..\src\OpenCvSharp.Blob\bin\Release\net461\OpenCvSharp.Blob.xml" target="lib\net461" />
64+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.dll" target="lib\net461" />
65+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.pdb" target="lib\net461" />
66+
<file src="..\src\OpenCvSharp.Extensions\bin\Release\net461\OpenCvSharp.Extensions.xml" target="lib\net461" />
67+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.dll" target="lib\net461" />
68+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.pdb" target="lib\net461" />
69+
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\net461\OpenCvSharp.UserInterface.xml" target="lib\net461" />
7070

7171
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.dll" target="lib\netstandard2.0" />
7272
<file src="..\src\OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.pdb" target="lib\netstandard2.0" />

‎nuget/nuget.exe

5.24 MB
Binary file not shown.

‎nuget/nuget/NuGet.Config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎nuget/nuget/NuGet.exe

-3.77 MB
Binary file not shown.

0 commit comments

Comments
 (0)