Skip to content

Commit a985f01

Browse files
shimatshimat
committed
Merge remote-tracking branch 'remotes/origin/master' into superres_add_proprs
2 parents 5a1792b + eb569c9 commit a985f01

12 files changed

+63
-56
lines changed

‎.gitmodules

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

‎LICENSE

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,36 @@
1-
BSD 3-Clause License
2-
3-
Copyright (c) 2017, shimat
4-
All rights reserved.
5-
6-
Redistribution and use in source and binary forms, with or without
7-
modification, are permitted provided that the following conditions are met:
8-
9-
* Redistributions of source code must retain the above copyright notice, this
10-
list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
16-
* Neither the name of the copyright holder nor the names of its
17-
contributors may be used to endorse or promote products derived from
18-
this software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
By downloading, copying, installing or using the software you agree to this license.
2+
If you do not agree to this license, do not download, install,
3+
copy or use the software.
4+
5+
6+
License Agreement
7+
For Open Source Computer Vision Library
8+
(3-clause BSD License)
9+
10+
Copyright (c) 2008-2019, shimat
11+
Third party copyrights are property of their respective owners.
12+
13+
Redistribution and use in source and binary forms, with or without modification,
14+
are permitted provided that the following conditions are met:
15+
16+
* Redistributions of source code must retain the above copyright notice,
17+
this list of conditions and the following disclaimer.
18+
19+
* Redistributions in binary form must reproduce the above copyright notice,
20+
this list of conditions and the following disclaimer in the documentation
21+
and/or other materials provided with the distribution.
22+
23+
* Neither the names of the copyright holders nor the names of the contributors
24+
may be used to endorse or promote products derived from this software
25+
without specific prior written permission.
26+
27+
This software is provided by the copyright holders and contributors "as is" and
28+
any express or implied warranties, including, but not limited to, the implied
29+
warranties of merchantability and fitness for a particular purpose are disclaimed.
30+
In no event shall copyright holders or contributors be liable for any direct,
31+
indirect, incidental, special, exemplary, or consequential damages
32+
(including, but not limited to, procurement of substitute goods or services;
33+
loss of use, data, or profits; or business interruption) however caused
34+
and on any theory of liability, whether in contract, strict liability,
35+
or tort (including negligence or otherwise) arising in any way out of
36+
the use of this software, even if advised of the possibility of such damage.

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '4.0.0-{build}'
1+
version: '4.0.1-{build}'
22

33
#environment:
44
# APPVEYOR_SAVE_CACHE_ON_ERROR: false

‎nuget/OpenCvSharp4.Windows.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181228</version>
66
<title>OpenCvSharp NuGet package for x64/x86 Windows (same as OpenCvSharp3-AnyCPU)</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181228</version>
66
<title>OpenCvSharp core library. A package of separate native bindings for your OS is required.</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.runtime.ubuntu.18.04-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181225</version>
66
<title>OpenCvSharp native bindings for ubuntu.18.04-x64</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuget/OpenCvSharp4.runtime.win.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<version>4.0.0.20181225</version>
66
<title>OpenCvSharp4 native bindings for Windows x64/x86</title>
77
<authors>shimat</authors>
8-
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
8+
<license type="expression">BSD-3-Clause</license>
99
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -26,8 +26,8 @@
2626
<files>
2727
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
2828
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
29-
<file src="..\opencv_files_400\lib\x64\vc15\bin\opencv_ffmpeg400_64.dll" target="runtimes\win-x64\native" />
30-
<file src="..\opencv_files_400\lib\x86\vc15\bin\opencv_ffmpeg400.dll" target="runtimes\win-x86\native" />
29+
<file src="..\opencv_files_401\lib\x64\vc15\bin\opencv_ffmpeg401_64.dll" target="runtimes\win-x64\native" />
30+
<file src="..\opencv_files_401\lib\x86\vc15\bin\opencv_ffmpeg401.dll" target="runtimes\win-x86\native" />
3131
<file src="OpenCvSharp4.runtime.win.props" target="build\net\OpenCvSharp4.runtime.win.props" />
3232
</files>
3333
</package>

‎nuget/OpenCvSharp4.runtime.win.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99
</None>
10-
<None Include="$(NativeDlls)\win-x86\native\opencv_ffmpeg400.dll">
11-
<Link>dll\x86\opencv_ffmpeg400.dll</Link>
10+
<None Include="$(NativeDlls)\win-x86\native\opencv_ffmpeg401.dll">
11+
<Link>dll\x86\opencv_ffmpeg401.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</None>
1414
</ItemGroup>
@@ -17,8 +17,8 @@
1717
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Include="$(NativeDlls)\win-x64\native\opencv_ffmpeg400_64.dll">
21-
<Link>dll\x64\opencv_ffmpeg400_64.dll</Link>
20+
<None Include="$(NativeDlls)\win-x64\native\opencv_ffmpeg401_64.dll">
21+
<Link>dll\x64\opencv_ffmpeg401_64.dll</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
2424
</ItemGroup>

‎opencv_files_400

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎opencv_files_401

Submodule opencv_files_401 added at 7a02954

‎src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\$(Configuration)\$(PlatformName)\</OutDir>
8080
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src\$(Platform)\$(Configuration)\</IntDir>
8181
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
82-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files_400\include\x64;$(IncludePath)</IncludePath>
83-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files_400\include\x64;$(IncludePath)</IncludePath>
84-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files_400\lib\x64\vc15\staticlib;$(LibraryPath)</LibraryPath>
85-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files_400\lib\x64\vc15\staticlib;$(LibraryPath)</LibraryPath>
86-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files_400\include\x86;$(IncludePath)</IncludePath>
87-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files_400\include\x86;$(IncludePath)</IncludePath>
88-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files_400\lib\x86\vc15\staticlib;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(LibraryPath)</LibraryPath>
89-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files_400\lib\x86\vc15\staticlib;$(LibraryPath)</LibraryPath>
82+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files_401\include\x64;$(IncludePath)</IncludePath>
83+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files_401\include\x64;$(IncludePath)</IncludePath>
84+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files_401\lib\x64\vc15\staticlib;$(LibraryPath)</LibraryPath>
85+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files_401\lib\x64\vc15\staticlib;$(LibraryPath)</LibraryPath>
86+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files_401\include\x86;$(IncludePath)</IncludePath>
87+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files_401\include\x86;$(IncludePath)</IncludePath>
88+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files_401\lib\x86\vc15\staticlib;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(LibraryPath)</LibraryPath>
89+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files_401\lib\x86\vc15\staticlib;$(LibraryPath)</LibraryPath>
9090
</PropertyGroup>
9191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<ClCompile>
@@ -164,7 +164,7 @@
164164
<MultiProcessorCompilation>true</MultiProcessorCompilation>
165165
</ClCompile>
166166
<Link>
167-
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco400.lib;opencv_bgsegm400.lib;opencv_bioinspired400.lib;opencv_calib3d400.lib;opencv_ccalib400.lib;opencv_core400.lib;opencv_datasets400.lib;opencv_dnn400.lib;opencv_dnn_objdetect400.lib;opencv_dpm400.lib;opencv_face400.lib;opencv_features2d400.lib;opencv_flann400.lib;opencv_fuzzy400.lib;opencv_gapi400.lib;opencv_hfs400.lib;opencv_highgui400.lib;opencv_imgcodecs400.lib;opencv_imgproc400.lib;opencv_img_hash400.lib;opencv_line_descriptor400.lib;opencv_ml400.lib;opencv_objdetect400.lib;opencv_optflow400.lib;opencv_phase_unwrapping400.lib;opencv_photo400.lib;opencv_plot400.lib;opencv_reg400.lib;opencv_rgbd400.lib;opencv_saliency400.lib;opencv_shape400.lib;opencv_stereo400.lib;opencv_stitching400.lib;opencv_structured_light400.lib;opencv_superres400.lib;opencv_surface_matching400.lib;opencv_text400.lib;opencv_tracking400.lib;opencv_video400.lib;opencv_videoio400.lib;opencv_videostab400.lib;opencv_xfeatures2d400.lib;opencv_ximgproc400.lib;opencv_xobjdetect400.lib;opencv_xphoto400.lib;quirc.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
167+
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco401.lib;opencv_bgsegm401.lib;opencv_bioinspired401.lib;opencv_calib3d401.lib;opencv_ccalib401.lib;opencv_core401.lib;opencv_datasets401.lib;opencv_dnn401.lib;opencv_dnn_objdetect401.lib;opencv_dpm401.lib;opencv_face401.lib;opencv_features2d401.lib;opencv_flann401.lib;opencv_fuzzy401.lib;opencv_gapi401.lib;opencv_hfs401.lib;opencv_highgui401.lib;opencv_imgcodecs401.lib;opencv_imgproc401.lib;opencv_img_hash401.lib;opencv_line_descriptor401.lib;opencv_ml401.lib;opencv_objdetect401.lib;opencv_optflow401.lib;opencv_phase_unwrapping401.lib;opencv_photo401.lib;opencv_plot401.lib;opencv_reg401.lib;opencv_rgbd401.lib;opencv_saliency401.lib;opencv_shape401.lib;opencv_stereo401.lib;opencv_stitching401.lib;opencv_structured_light401.lib;opencv_superres401.lib;opencv_surface_matching401.lib;opencv_text401.lib;opencv_tracking401.lib;opencv_video401.lib;opencv_videoio401.lib;opencv_videostab401.lib;opencv_xfeatures2d401.lib;opencv_ximgproc401.lib;opencv_xobjdetect401.lib;opencv_xphoto401.lib;quirc.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
168168
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
169169
<GenerateDebugInformation>true</GenerateDebugInformation>
170170
<SubSystem>NotSet</SubSystem>
@@ -203,7 +203,7 @@
203203
<MultiProcessorCompilation>true</MultiProcessorCompilation>
204204
</ClCompile>
205205
<Link>
206-
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco400.lib;opencv_bgsegm400.lib;opencv_bioinspired400.lib;opencv_calib3d400.lib;opencv_ccalib400.lib;opencv_core400.lib;opencv_datasets400.lib;opencv_dnn400.lib;opencv_dnn_objdetect400.lib;opencv_dpm400.lib;opencv_face400.lib;opencv_features2d400.lib;opencv_flann400.lib;opencv_fuzzy400.lib;opencv_gapi400.lib;opencv_hfs400.lib;opencv_highgui400.lib;opencv_imgcodecs400.lib;opencv_imgproc400.lib;opencv_img_hash400.lib;opencv_line_descriptor400.lib;opencv_ml400.lib;opencv_objdetect400.lib;opencv_optflow400.lib;opencv_phase_unwrapping400.lib;opencv_photo400.lib;opencv_plot400.lib;opencv_reg400.lib;opencv_rgbd400.lib;opencv_saliency400.lib;opencv_shape400.lib;opencv_stereo400.lib;opencv_stitching400.lib;opencv_structured_light400.lib;opencv_superres400.lib;opencv_surface_matching400.lib;opencv_text400.lib;opencv_tracking400.lib;opencv_video400.lib;opencv_videoio400.lib;opencv_videostab400.lib;opencv_xfeatures2d400.lib;opencv_ximgproc400.lib;opencv_xobjdetect400.lib;opencv_xphoto400.lib;quirc.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
206+
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco401.lib;opencv_bgsegm401.lib;opencv_bioinspired401.lib;opencv_calib3d401.lib;opencv_ccalib401.lib;opencv_core401.lib;opencv_datasets401.lib;opencv_dnn401.lib;opencv_dnn_objdetect401.lib;opencv_dpm401.lib;opencv_face401.lib;opencv_features2d401.lib;opencv_flann401.lib;opencv_fuzzy401.lib;opencv_gapi401.lib;opencv_hfs401.lib;opencv_highgui401.lib;opencv_imgcodecs401.lib;opencv_imgproc401.lib;opencv_img_hash401.lib;opencv_line_descriptor401.lib;opencv_ml401.lib;opencv_objdetect401.lib;opencv_optflow401.lib;opencv_phase_unwrapping401.lib;opencv_photo401.lib;opencv_plot401.lib;opencv_reg401.lib;opencv_rgbd401.lib;opencv_saliency401.lib;opencv_shape401.lib;opencv_stereo401.lib;opencv_stitching401.lib;opencv_structured_light401.lib;opencv_superres401.lib;opencv_surface_matching401.lib;opencv_text401.lib;opencv_tracking401.lib;opencv_video401.lib;opencv_videoio401.lib;opencv_videostab401.lib;opencv_xfeatures2d401.lib;opencv_ximgproc401.lib;opencv_xobjdetect401.lib;opencv_xphoto401.lib;quirc.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
207207
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
208208
<GenerateDebugInformation>true</GenerateDebugInformation>
209209
<SubSystem>NotSet</SubSystem>

‎test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
4242
<PackageReference Include="xunit" Version="2.4.1" />
4343
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
4444
<PrivateAssets>all</PrivateAssets>
4545
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4646
</PackageReference>
47-
<PackageReference Include="Xunit.StaFact" Version="0.3.13" />
47+
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
4848
</ItemGroup>
4949

5050
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">

0 commit comments

Comments
 (0)