Skip to content

Commit

Permalink
Merge pull request #1247 from shimat/4.5.2
Browse files Browse the repository at this point in the history
4.5.2
  • Loading branch information
shimat authored Apr 5, 2021
2 parents 0572828 + 7187b31 commit 110a773
Show file tree
Hide file tree
Showing 14 changed files with 102 additions and 74 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/macos10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.5.1
OPENCV_VERSION: 4.5.2

jobs:
build:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
-DBUILD_opencv_dnn_objdetect=OFF \
-DBUILD_opencv_dpm=OFF \
-DBUILD_opencv_fuzzy=OFF \
-DBUILD_opencv_gapi=OFF \
-DBUILD_opencv_gapi=ON \
-DBUILD_opencv_intensity_transform=OFF \
-DBUILD_opencv_mcc=OFF \
-DBUILD_opencv_rapid=OFF \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.5.1
OPENCV_VERSION: 4.5.2

jobs:
build:
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
-D BUILD_opencv_dnn_objdetect=OFF \
-D BUILD_opencv_dpm=OFF \
-D BUILD_opencv_fuzzy=OFF \
-D BUILD_opencv_gapi=OFF \
-D BUILD_opencv_gapi=ON \
-D BUILD_opencv_intensity_transform=OFF \
-D BUILD_opencv_mcc=OFF \
-D BUILD_opencv_rapid=OFF \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- master

env:
OPENCV_VERSION: 4.5.1
OPENCV_VERSION: 4.5.2

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions download_opencv_windows.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$tag = "4.5.1.20201228"
$version = "451"
$tag = "4.5.2.20210404"
$version = "452"
$uriArray =@(
"https://github.com/shimat/opencv_files/releases/download/${tag}/opencv${version}_win_x64.zip"
"https://github.com/shimat/opencv_files/releases/download/${tag}/opencv${version}_win_x86.zip"
Expand Down
12 changes: 6 additions & 6 deletions nuget/OpenCvSharp4.runtime.uwp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<file src="..\src\Release\uwpOpenCvSharpExtern\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
<file src="..\src\Release\uwpOpenCvSharpExtern\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
<file src="..\src\Release\uwpOpenCvSharpExtern\ARM\OpenCvSharpExtern.dll" target="runtimes\win-arm\native" />
<file src="..\opencv_files\opencv451_uwp_x64\x64\vc16\bin\opencv_world451.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv451_uwp_x86\x86\vc16\bin\opencv_world451.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv451_uwp_arm\x86\vc16\bin\opencv_world451.dll" target="runtimes\win-arm\native" />
<file src="..\opencv_files\opencv451_uwp_x64\x64\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv451_uwp_x86\x86\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv451_uwp_arm\x86\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-arm\native" />
<file src="..\opencv_files\opencv452_uwp_x64\x64\vc16\bin\opencv_world452.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv452_uwp_x86\x86\vc16\bin\opencv_world452.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv452_uwp_arm\x86\vc16\bin\opencv_world452.dll" target="runtimes\win-arm\native" />
<file src="..\opencv_files\opencv452_uwp_x64\x64\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv452_uwp_x86\x86\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv452_uwp_arm\x86\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-arm\native" />
</files>
</package>
5 changes: 2 additions & 3 deletions nuget/OpenCvSharp4.runtime.win.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
<repository type="git" url="https://github.com/shimat/opencvsharp.git" />
<dependencies>
<group targetFramework="net48"></group>
<group targetFramework="net461"></group>
<group targetFramework="netstandard2.0"></group>
<group targetFramework="netstandard2.1"></group>
Expand All @@ -28,8 +27,8 @@
<files>
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv451_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg451_64.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv452_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg452_64.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" target="runtimes\win-x86\native" />
<file src="OpenCvSharp4.runtime.win.props" target="build\net\OpenCvSharp4.runtime.win.props" />
<file src="OpenCvSharp4.runtime.win.props" target="build\netstandard\OpenCvSharp4.runtime.win.props" />
<file src="OpenCvSharp4.runtime.win.props" target="build\netcoreapp\OpenCvSharp4.runtime.win.props" />
Expand Down
8 changes: 4 additions & 4 deletions nuget/OpenCvSharp4.runtime.win.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg451.dll">
<Link>dll\x86\opencv_videoio_ffmpeg451.dll</Link>
<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg452.dll">
<Link>dll\x86\opencv_videoio_ffmpeg452.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
Expand All @@ -17,8 +17,8 @@
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg451_64.dll">
<Link>dll\x64\opencv_videoio_ffmpeg451_64.dll</Link>
<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg452_64.dll">
<Link>dll\x64\opencv_videoio_ffmpeg452_64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@ public enum ConnectedComponentsAlgorithmsTypes
/// <summary>
/// BBDT algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
/// </summary>
GRANA = 1
GRANA = 1,

/// <summary>
/// Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity.
/// </summary>
BOLELLI = 2,

/// <summary>
/// Same as CCL_WU. It is preferable to use the flag with the name of the algorithm (CCL_SAUF) rather than the one with the name of the first author (CCL_WU).
/// </summary>
SAUF = 3,

/// <summary>
/// Same as CCL_GRANA. It is preferable to use the flag with the name of the algorithm (CCL_BBDT) rather than the one with the name of the first author (CCL_GRANA).
/// </summary>
BBDT = 4,

/// <summary>
/// Same as CCL_BOLELLI. It is preferable to use the flag with the name of the algorithm (CCL_SPAGHETTI) rather than the one with the name of the first author (CCL_BOLELLI).
/// </summary>
SPAGHETTI = 5,
}
}
28 changes: 14 additions & 14 deletions src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)src\$(Configuration)\$(PlatformName)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">src\$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\x64\vc16\staticlib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x64-windows-static\lib;$(LibraryPath)</LibraryPath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\x86\vc16\staticlib;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x86-windows-static\lib;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\x86\vc16\staticlib;$(LibraryPath)</LibraryPath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\x64\vc16\staticlib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x64-windows-static\lib;$(LibraryPath)</LibraryPath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\include;$(IncludePath)</IncludePath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\x86\vc16\staticlib;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x86-windows-static\lib;$(LibraryPath)</LibraryPath>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\x86\vc16\staticlib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down Expand Up @@ -164,7 +164,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libopenjp2.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco451.lib;opencv_bgsegm451.lib;opencv_bioinspired451.lib;opencv_calib3d451.lib;opencv_ccalib451.lib;opencv_core451.lib;opencv_dnn451.lib;opencv_dnn_superres451.lib;opencv_dnn_objdetect451.lib;opencv_dpm451.lib;opencv_face451.lib;opencv_features2d451.lib;opencv_flann451.lib;opencv_fuzzy451.lib;opencv_hfs451.lib;opencv_highgui451.lib;opencv_imgcodecs451.lib;opencv_imgproc451.lib;opencv_img_hash451.lib;opencv_line_descriptor451.lib;opencv_ml451.lib;opencv_objdetect451.lib;opencv_optflow451.lib;opencv_phase_unwrapping451.lib;opencv_photo451.lib;opencv_plot451.lib;opencv_quality451.lib;opencv_reg451.lib;opencv_rgbd451.lib;opencv_saliency451.lib;opencv_shape451.lib;opencv_stereo451.lib;opencv_stitching451.lib;opencv_structured_light451.lib;opencv_superres451.lib;opencv_surface_matching451.lib;opencv_text451.lib;opencv_tracking451.lib;opencv_video451.lib;opencv_videoio451.lib;opencv_videostab451.lib;opencv_xfeatures2d451.lib;opencv_ximgproc451.lib;opencv_xobjdetect451.lib;opencv_xphoto451.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.80.0.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;tiffxx.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libopenjp2.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco452.lib;opencv_bgsegm452.lib;opencv_bioinspired452.lib;opencv_calib3d452.lib;opencv_ccalib452.lib;opencv_core452.lib;opencv_dnn452.lib;opencv_dnn_superres452.lib;opencv_dnn_objdetect452.lib;opencv_dpm452.lib;opencv_face452.lib;opencv_features2d452.lib;opencv_flann452.lib;opencv_fuzzy452.lib;opencv_hfs452.lib;opencv_highgui452.lib;opencv_imgcodecs452.lib;opencv_imgproc452.lib;opencv_img_hash452.lib;opencv_line_descriptor452.lib;opencv_ml452.lib;opencv_objdetect452.lib;opencv_optflow452.lib;opencv_phase_unwrapping452.lib;opencv_photo452.lib;opencv_plot452.lib;opencv_quality452.lib;opencv_reg452.lib;opencv_rgbd452.lib;opencv_saliency452.lib;opencv_shape452.lib;opencv_stereo452.lib;opencv_stitching452.lib;opencv_structured_light452.lib;opencv_superres452.lib;opencv_surface_matching452.lib;opencv_text452.lib;opencv_tracking452.lib;opencv_video452.lib;opencv_videoio452.lib;opencv_videostab452.lib;opencv_xfeatures2d452.lib;opencv_ximgproc452.lib;opencv_xobjdetect452.lib;opencv_xphoto452.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.80.0.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;tiffxx.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>NotSet</SubSystem>
Expand All @@ -179,8 +179,8 @@
<PostBuildEvent>
<Command>copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\$(TargetFileName)"
copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\$(TargetFileName)"
copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg451.dll"
copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg451.dll"
copy "$(SolutionDir)opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg452.dll"
copy "$(SolutionDir)opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg452.dll"
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
Expand All @@ -207,7 +207,7 @@ copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_f
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>ade.lib;IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libopenjp2.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco451.lib;opencv_bgsegm451.lib;opencv_bioinspired451.lib;opencv_calib3d451.lib;opencv_ccalib451.lib;opencv_core451.lib;opencv_dnn451.lib;opencv_dnn_superres451.lib;opencv_dnn_objdetect451.lib;opencv_dpm451.lib;opencv_face451.lib;opencv_features2d451.lib;opencv_flann451.lib;opencv_fuzzy451.lib;opencv_hfs451.lib;opencv_highgui451.lib;opencv_imgcodecs451.lib;opencv_imgproc451.lib;opencv_img_hash451.lib;opencv_line_descriptor451.lib;opencv_ml451.lib;opencv_objdetect451.lib;opencv_optflow451.lib;opencv_phase_unwrapping451.lib;opencv_photo451.lib;opencv_plot451.lib;opencv_quality451.lib;opencv_reg451.lib;opencv_rgbd451.lib;opencv_saliency451.lib;opencv_shape451.lib;opencv_stereo451.lib;opencv_stitching451.lib;opencv_structured_light451.lib;opencv_superres451.lib;opencv_surface_matching451.lib;opencv_text451.lib;opencv_tracking451.lib;opencv_video451.lib;opencv_videoio451.lib;opencv_videostab451.lib;opencv_xfeatures2d451.lib;opencv_ximgproc451.lib;opencv_xobjdetect451.lib;opencv_xphoto451.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.80.0.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;tiffxx.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libopenjp2.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco452.lib;opencv_bgsegm452.lib;opencv_bioinspired452.lib;opencv_calib3d452.lib;opencv_ccalib452.lib;opencv_core452.lib;opencv_dnn452.lib;opencv_dnn_superres452.lib;opencv_dnn_objdetect452.lib;opencv_dpm452.lib;opencv_face452.lib;opencv_features2d452.lib;opencv_flann452.lib;opencv_fuzzy452.lib;opencv_hfs452.lib;opencv_highgui452.lib;opencv_imgcodecs452.lib;opencv_imgproc452.lib;opencv_img_hash452.lib;opencv_line_descriptor452.lib;opencv_ml452.lib;opencv_objdetect452.lib;opencv_optflow452.lib;opencv_phase_unwrapping452.lib;opencv_photo452.lib;opencv_plot452.lib;opencv_quality452.lib;opencv_reg452.lib;opencv_rgbd452.lib;opencv_saliency452.lib;opencv_shape452.lib;opencv_stereo452.lib;opencv_stitching452.lib;opencv_structured_light452.lib;opencv_superres452.lib;opencv_surface_matching452.lib;opencv_text452.lib;opencv_tracking452.lib;opencv_video452.lib;opencv_videoio452.lib;opencv_videostab452.lib;opencv_xfeatures2d452.lib;opencv_ximgproc452.lib;opencv_xobjdetect452.lib;opencv_xphoto452.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.80.0.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;tiffxx.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>NotSet</SubSystem>
Expand All @@ -222,8 +222,8 @@ copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_f
<PostBuildEvent>
<Command>copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\$(TargetFileName)"
copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\$(TargetFileName)"
copy "$(SolutionDir)opencv_files\opencv451_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg451_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg451_64.dll"
copy "$(SolutionDir)opencv_files\opencv451_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg451_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\opencv_videoio_ffmpeg451_64.dll"</Command>
copy "$(SolutionDir)opencv_files\opencv452_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg452_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg452_64.dll"
copy "$(SolutionDir)opencv_files\opencv452_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg452_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\opencv_videoio_ffmpeg452_64.dll"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit 110a773

Please sign in to comment.