Skip to content

Commit 110a773

Browse files
shimatshimat
authored
Merge pull request #1247 from shimat/4.5.2
4.5.2
2 parents 0572828 + 7187b31 commit 110a773

File tree

14 files changed

+102
-74
lines changed

14 files changed

+102
-74
lines changed

‎.github/workflows/macos10.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
OPENCV_VERSION: 4.5.1
12+
OPENCV_VERSION: 4.5.2
1313

1414
jobs:
1515
build:
@@ -60,7 +60,7 @@ jobs:
6060
-DBUILD_opencv_dnn_objdetect=OFF \
6161
-DBUILD_opencv_dpm=OFF \
6262
-DBUILD_opencv_fuzzy=OFF \
63-
-DBUILD_opencv_gapi=OFF \
63+
-DBUILD_opencv_gapi=ON \
6464
-DBUILD_opencv_intensity_transform=OFF \
6565
-DBUILD_opencv_mcc=OFF \
6666
-DBUILD_opencv_rapid=OFF \

‎.github/workflows/ubuntu18.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
OPENCV_VERSION: 4.5.1
12+
OPENCV_VERSION: 4.5.2
1313

1414
jobs:
1515
build:
@@ -89,7 +89,7 @@ jobs:
8989
-D BUILD_opencv_dnn_objdetect=OFF \
9090
-D BUILD_opencv_dpm=OFF \
9191
-D BUILD_opencv_fuzzy=OFF \
92-
-D BUILD_opencv_gapi=OFF \
92+
-D BUILD_opencv_gapi=ON \
9393
-D BUILD_opencv_intensity_transform=OFF \
9494
-D BUILD_opencv_mcc=OFF \
9595
-D BUILD_opencv_rapid=OFF \

‎.github/workflows/windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- master
99

1010
env:
11-
OPENCV_VERSION: 4.5.1
11+
OPENCV_VERSION: 4.5.2
1212

1313
jobs:
1414
build:

‎download_opencv_windows.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$tag = "4.5.1.20201228"
2-
$version = "451"
1+
$tag = "4.5.2.20210404"
2+
$version = "452"
33
$uriArray =@(
44
"https://github.com/shimat/opencv_files/releases/download/${tag}/opencv${version}_win_x64.zip"
55
"https://github.com/shimat/opencv_files/releases/download/${tag}/opencv${version}_win_x86.zip"

‎nuget/OpenCvSharp4.runtime.uwp.nuspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
<file src="..\src\Release\uwpOpenCvSharpExtern\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
2828
<file src="..\src\Release\uwpOpenCvSharpExtern\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
2929
<file src="..\src\Release\uwpOpenCvSharpExtern\ARM\OpenCvSharpExtern.dll" target="runtimes\win-arm\native" />
30-
<file src="..\opencv_files\opencv451_uwp_x64\x64\vc16\bin\opencv_world451.dll" target="runtimes\win-x64\native" />
31-
<file src="..\opencv_files\opencv451_uwp_x86\x86\vc16\bin\opencv_world451.dll" target="runtimes\win-x86\native" />
32-
<file src="..\opencv_files\opencv451_uwp_arm\x86\vc16\bin\opencv_world451.dll" target="runtimes\win-arm\native" />
33-
<file src="..\opencv_files\opencv451_uwp_x64\x64\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-x64\native" />
34-
<file src="..\opencv_files\opencv451_uwp_x86\x86\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-x86\native" />
35-
<file src="..\opencv_files\opencv451_uwp_arm\x86\vc16\bin\opencv_img_hash451.dll" target="runtimes\win-arm\native" />
30+
<file src="..\opencv_files\opencv452_uwp_x64\x64\vc16\bin\opencv_world452.dll" target="runtimes\win-x64\native" />
31+
<file src="..\opencv_files\opencv452_uwp_x86\x86\vc16\bin\opencv_world452.dll" target="runtimes\win-x86\native" />
32+
<file src="..\opencv_files\opencv452_uwp_arm\x86\vc16\bin\opencv_world452.dll" target="runtimes\win-arm\native" />
33+
<file src="..\opencv_files\opencv452_uwp_x64\x64\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-x64\native" />
34+
<file src="..\opencv_files\opencv452_uwp_x86\x86\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-x86\native" />
35+
<file src="..\opencv_files\opencv452_uwp_arm\x86\vc16\bin\opencv_img_hash452.dll" target="runtimes\win-arm\native" />
3636
</files>
3737
</package>

‎nuget/OpenCvSharp4.runtime.win.nuspec‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
1717
<repository type="git" url="https://github.com/shimat/opencvsharp.git" />
1818
<dependencies>
19-
<group targetFramework="net48"></group>
2019
<group targetFramework="net461"></group>
2120
<group targetFramework="netstandard2.0"></group>
2221
<group targetFramework="netstandard2.1"></group>
@@ -28,8 +27,8 @@
2827
<files>
2928
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
3029
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
31-
<file src="..\opencv_files\opencv451_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg451_64.dll" target="runtimes\win-x64\native" />
32-
<file src="..\opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" target="runtimes\win-x86\native" />
30+
<file src="..\opencv_files\opencv452_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg452_64.dll" target="runtimes\win-x64\native" />
31+
<file src="..\opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" target="runtimes\win-x86\native" />
3332
<file src="OpenCvSharp4.runtime.win.props" target="build\net\OpenCvSharp4.runtime.win.props" />
3433
<file src="OpenCvSharp4.runtime.win.props" target="build\netstandard\OpenCvSharp4.runtime.win.props" />
3534
<file src="OpenCvSharp4.runtime.win.props" target="build\netcoreapp\OpenCvSharp4.runtime.win.props" />

‎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
</Content>
10-
<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg451.dll">
11-
<Link>dll\x86\opencv_videoio_ffmpeg451.dll</Link>
10+
<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg452.dll">
11+
<Link>dll\x86\opencv_videoio_ffmpeg452.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</Content>
1414
</ItemGroup>
@@ -17,8 +17,8 @@
1717
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</Content>
20-
<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg451_64.dll">
21-
<Link>dll\x64\opencv_videoio_ffmpeg451_64.dll</Link>
20+
<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg452_64.dll">
21+
<Link>dll\x64\opencv_videoio_ffmpeg452_64.dll</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</Content>
2424
</ItemGroup>

‎samples‎

‎src/OpenCvSharp/Modules/imgproc/Enum/ConnectedComponentsAlgorithmsTypes.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@ public enum ConnectedComponentsAlgorithmsTypes
2121
/// <summary>
2222
/// BBDT algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity
2323
/// </summary>
24-
GRANA = 1
24+
GRANA = 1,
25+
26+
/// <summary>
27+
/// Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity.
28+
/// </summary>
29+
BOLELLI = 2,
30+
31+
/// <summary>
32+
/// 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).
33+
/// </summary>
34+
SAUF = 3,
35+
36+
/// <summary>
37+
/// 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).
38+
/// </summary>
39+
BBDT = 4,
40+
41+
/// <summary>
42+
/// 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).
43+
/// </summary>
44+
SPAGHETTI = 5,
2545
}
2646
}

‎src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj‎

Lines changed: 14 additions & 14 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\opencv451_win_x64\include;$(IncludePath)</IncludePath>
83-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\include;$(IncludePath)</IncludePath>
84-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv451_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
85-
<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>
86-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\include;$(IncludePath)</IncludePath>
87-
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\include;$(IncludePath)</IncludePath>
88-
<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>
89-
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv451_win_x86\x86\vc16\staticlib;$(LibraryPath)</LibraryPath>
82+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\include;$(IncludePath)</IncludePath>
83+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\include;$(IncludePath)</IncludePath>
84+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv452_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
85+
<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>
86+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\include;$(IncludePath)</IncludePath>
87+
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\include;$(IncludePath)</IncludePath>
88+
<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>
89+
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv452_win_x86\x86\vc16\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;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>
167+
<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>
168168
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
169169
<GenerateDebugInformation>true</GenerateDebugInformation>
170170
<SubSystem>NotSet</SubSystem>
@@ -179,8 +179,8 @@
179179
<PostBuildEvent>
180180
<Command>copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\$(TargetFileName)"
181181
copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\$(TargetFileName)"
182-
copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg451.dll"
183-
copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg451.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg451.dll"
182+
copy "$(SolutionDir)opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg452.dll"
183+
copy "$(SolutionDir)opencv_files\opencv452_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg452.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg452.dll"
184184
</Command>
185185
</PostBuildEvent>
186186
</ItemDefinitionGroup>
@@ -207,7 +207,7 @@ copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_f
207207
<MultiProcessorCompilation>true</MultiProcessorCompilation>
208208
</ClCompile>
209209
<Link>
210-
<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>
210+
<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>
211211
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
212212
<GenerateDebugInformation>true</GenerateDebugInformation>
213213
<SubSystem>NotSet</SubSystem>
@@ -222,8 +222,8 @@ copy "$(SolutionDir)opencv_files\opencv451_win_x86\x86\vc16\bin\opencv_videoio_f
222222
<PostBuildEvent>
223223
<Command>copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\$(TargetFileName)"
224224
copy "$(LocalDebuggerCommand)" "$(SolutionDir)test\OpenCvSharp.Tests\$(TargetFileName)"
225-
copy "$(SolutionDir)opencv_files\opencv451_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg451_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg451_64.dll"
226-
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>
225+
copy "$(SolutionDir)opencv_files\opencv452_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg452_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg452_64.dll"
226+
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>
227227
</PostBuildEvent>
228228
</ItemDefinitionGroup>
229229
<ItemGroup>

0 commit comments

Comments
 (0)