Skip to content

Commit f960bf1

Browse files
shimatshimat
authored
Merge pull request shimat#278 from shimat/hello_contrib
Hello contrib
2 parents e2bbb88 + 7596c02 commit f960bf1

16 files changed

+34
-377
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,4 @@ Help EN
116116
/src/OpenCvSharp.Sandbox/dll/x86/OpenCvSharpExtern.dll
117117
/src/*.opendb
118118
*.BAK
119+
/nuget/*.nupkg

‎nuget/OpenCvSharp3-AnyCPU.nuspec

Lines changed: 5 additions & 21 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-AnyCPU</id>
5-
<version>3.1.0.20161105</version>
5+
<version>3.2.0.20170107</version>
66
<title>OpenCvSharp3</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
@@ -11,9 +11,8 @@
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>OpenCV wrapper for .NET Framework</description>
1313
<summary>OpenCV 3.x wrapper</summary>
14-
<releaseNotes>- Fixed #265, #261, #248, #211 and #206
15-
- Added reference to PresentationFramework (Extensions)</releaseNotes>
16-
<copyright>Copyright 2008-2016</copyright>
14+
<releaseNotes>- support OpenCV 3.2 with contrib modules</releaseNotes>
15+
<copyright>Copyright 2008-2017</copyright>
1716
<tags>Image Processing OpenCV Wrapper FFI</tags>
1817
<frameworkAssemblies>
1918
<frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework2.0, .NETFramework3.5" />
@@ -51,25 +50,10 @@
5150
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.XML" target="lib\net40\OpenCvSharp.Extensions.XML" />
5251
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
5352
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.xml" target="lib\net40\OpenCvSharp.XML" />
54-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net45\OpenCvSharp.Blob.dll" />
55-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net45\OpenCvSharp.Blob.dll.config" />
56-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.XML" target="lib\net45\OpenCvSharp.Blob.XML" />
57-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net45\OpenCvSharp.dll" />
58-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net45\OpenCvSharp.dll.config" />
59-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net45\OpenCvSharp.Extensions.dll" />
60-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.XML" target="lib\net45\OpenCvSharp.Extensions.XML" />
61-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net45\OpenCvSharp.UserInterface.dll" />
62-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.xml" target="lib\net45\OpenCvSharp.XML" />
63-
<file src="..\lib\vc++\x64\msvcp120.dll" target="NativeDlls\x64\msvcp120.dll" />
64-
<file src="..\lib\vc++\x64\msvcr120.dll" target="NativeDlls\x64\msvcr120.dll" />
6553
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
66-
<file src="..\lib\opencv\x64\vc12\bin\opencv_ffmpeg310_64.dll" target="NativeDlls\x64\opencv_ffmpeg310_64.dll" />
67-
<file src="..\lib\opencv\x64\vc12\bin\opencv_world310.dll" target="NativeDlls\x64\opencv_world310.dll" />
68-
<file src="..\lib\vc++\x86\msvcp120.dll" target="NativeDlls\x86\msvcp120.dll" />
69-
<file src="..\lib\vc++\x86\msvcr120.dll" target="NativeDlls\x86\msvcr120.dll" />
54+
<file src="..\lib\opencv\x64\vc14\bin\opencv_ffmpeg320_64.dll" target="NativeDlls\x64\opencv_ffmpeg320_64.dll" />
7055
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
71-
<file src="..\lib\opencv\x86\vc12\bin\opencv_ffmpeg310.dll" target="NativeDlls\x86\opencv_ffmpeg310.dll" />
72-
<file src="..\lib\opencv\x86\vc12\bin\opencv_world310.dll" target="NativeDlls\x86\opencv_world310.dll" />
56+
<file src="..\lib\opencv\x86\vc14\bin\opencv_ffmpeg320.dll" target="NativeDlls\x86\opencv_ffmpeg320.dll" />
7357
<file src="tools\init.ps1" target="tools\init.ps1" />
7458
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />
7559
</files>

‎nuget/OpenCvSharp3-AnyCPU.props

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,43 +7,19 @@
77
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99
</None>
10-
<None Include="$(NativeDlls)\x86\msvcp120.dll">
11-
<Link>dll\x86\msvcp120.dll</Link>
10+
<None Include="$(NativeDlls)\x86\opencv_ffmpeg320.dll">
11+
<Link>dll\x86\opencv_ffmpeg320.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</None>
14-
<None Include="$(NativeDlls)\x86\msvcr120.dll">
15-
<Link>dll\x86\msvcr120.dll</Link>
16-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
17-
</None>
18-
<None Include="$(NativeDlls)\x86\opencv_world310.dll">
19-
<Link>dll\x86\opencv_world310.dll</Link>
20-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21-
</None>
22-
<None Include="$(NativeDlls)\x86\opencv_ffmpeg310.dll">
23-
<Link>dll\x86\opencv_ffmpeg310.dll</Link>
24-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25-
</None>
2614
</ItemGroup>
2715
<ItemGroup>
2816
<None Include="$(NativeDlls)\x64\OpenCvSharpExtern.dll">
2917
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
3018
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3119
</None>
32-
<None Include="$(NativeDlls)\x64\msvcp120.dll">
33-
<Link>dll\x64\msvcp120.dll</Link>
20+
<None Include="$(NativeDlls)\x64\opencv_ffmpeg320_64.dll">
21+
<Link>dll\x64\opencv_ffmpeg320_64.dll</Link>
3422
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3523
</None>
36-
<None Include="$(NativeDlls)\x64\msvcr120.dll">
37-
<Link>dll\x64\msvcr120.dll</Link>
38-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39-
</None>
40-
<None Include="$(NativeDlls)\x64\opencv_world310.dll">
41-
<Link>dll\x64\opencv_world310.dll</Link>
42-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43-
</None>
44-
<None Include="$(NativeDlls)\x64\opencv_ffmpeg310_64.dll">
45-
<Link>dll\x64\opencv_ffmpeg310_64.dll</Link>
46-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
47-
</None>
4824
</ItemGroup>
4925
</Project>

‎nuget/OpenCvSharp3-WithoutDll.nuspec

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-WithoutDll</id>
5-
<version>3.1.0.20161105</version>
5+
<version>3.2.0.20170107</version>
66
<title>OpenCvSharp3 (without DLLs)</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/mandrill-ico.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12-
<description>- Fixed #265, #261, #248, #211 and #206</description>
12+
<description>OpenCV wrapper for .NET Framework</description>
1313
<summary>OpenCV 3.x wrapper</summary>
14-
<releaseNotes>- Fixed #210, #222 and #227
15-
- Added reference to PresentationFramework (Extensions)</releaseNotes>
16-
<copyright>Copyright 2008-2016</copyright>
14+
<releaseNotes>- support OpenCV 3.2 with contrib modules</releaseNotes>
15+
<copyright>Copyright 2008-2017</copyright>
1716
<tags>Image Processing OpenCV Wrapper FFI</tags>
1817
<frameworkAssemblies>
1918
<frameworkAssembly assemblyName="System.Drawing" targetFramework=".NETFramework2.0, .NETFramework3.5" />
@@ -25,7 +24,7 @@
2524
</frameworkAssemblies>
2625
</metadata>
2726
<files>
28-
<file src="OpenCvSharp3-WithoutDll.props" target="build\OpenCvSharp3-WithoutDll.props" />
27+
<file src="build\_._" target="build\_._" />
2928
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net20\OpenCvSharp.Blob.dll" />
3029
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net20\OpenCvSharp.Blob.dll.config" />
3130
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.XML" target="lib\net20\OpenCvSharp.Blob.XML" />
@@ -51,21 +50,6 @@
5150
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.XML" target="lib\net40\OpenCvSharp.Extensions.XML" />
5251
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net40\OpenCvSharp.UserInterface.dll" />
5352
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.xml" target="lib\net40\OpenCvSharp.XML" />
54-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll" target="lib\net45\OpenCvSharp.Blob.dll" />
55-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.dll.config" target="lib\net45\OpenCvSharp.Blob.dll.config" />
56-
<file src="..\src\OpenCvSharp.Blob\bin\Release\OpenCvSharp.Blob.XML" target="lib\net45\OpenCvSharp.Blob.XML" />
57-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll" target="lib\net45\OpenCvSharp.dll" />
58-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.dll.config" target="lib\net45\OpenCvSharp.dll.config" />
59-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.dll" target="lib\net45\OpenCvSharp.Extensions.dll" />
60-
<file src="..\src\OpenCvSharp.Extensions\bin\Release\OpenCvSharp.Extensions.XML" target="lib\net45\OpenCvSharp.Extensions.XML" />
61-
<file src="..\src\OpenCvSharp.UserInterface\bin\Release\OpenCvSharp.UserInterface.dll" target="lib\net45\OpenCvSharp.UserInterface.dll" />
62-
<file src="..\src\OpenCvSharp\bin\Release\OpenCvSharp.xml" target="lib\net45\OpenCvSharp.XML" />
63-
<file src="..\lib\vc++\x64\msvcp120.dll" target="NativeDlls\x64\msvcp120.dll" />
64-
<file src="..\lib\vc++\x64\msvcr120.dll" target="NativeDlls\x64\msvcr120.dll" />
65-
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
66-
<file src="..\lib\vc++\x86\msvcp120.dll" target="NativeDlls\x86\msvcp120.dll" />
67-
<file src="..\lib\vc++\x86\msvcr120.dll" target="NativeDlls\x86\msvcr120.dll" />
68-
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
6953
<file src="tools\init.ps1" target="tools\init.ps1" />
7054
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />
7155
</files>

‎nuget/OpenCvSharp3-WithoutDll.props

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

0 commit comments

Comments
 (0)