Merge pull request #1428 from shimat/4.6.0

shimat · web-flow · commit d1daa48d64c3 · 2022-06-08T16:34:54.000+09:00
4.6.0
diff --git a/.github/workflows/linux-arm.yml b/.github/workflows/linux-arm.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.5.5
+  OPENCV_VERSION: 4.6.0
 
 jobs:
   build:
diff --git a/.github/workflows/macos10.yml b/.github/workflows/macos10.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.5.5
+  OPENCV_VERSION: 4.6.0
 
 jobs:
   build:
diff --git a/.github/workflows/ubuntu18.yml b/.github/workflows/ubuntu18.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.5.5
+  OPENCV_VERSION: 4.6.0
 
 jobs:
   build:
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   DEBIAN_FRONTEND: noninteractive
-  OPENCV_VERSION: 4.5.5
+  OPENCV_VERSION: 4.6.0
   EM_VERSION: 2.0.23
   EM_CACHE_FOLDER: 'emsdk-cache'
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,7 +8,7 @@ on:
       - master
 
 env:
-  OPENCV_VERSION: 4.5.5
+  OPENCV_VERSION: 4.6.0
 
 jobs:
   build:
diff --git a/download_opencv_windows.ps1 b/download_opencv_windows.ps1
@@ -1,5 +1,5 @@
-$tag = "4.5.5.20211229"
-$version = "455"
+$tag = "4.6.0.20220607"
+$version = "460"
 $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" 
diff --git a/nuget/OpenCvSharp4.runtime.uwp.nuspec b/nuget/OpenCvSharp4.runtime.uwp.nuspec
@@ -26,11 +26,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\opencv455_uwp_x64\x64\vc17\bin\opencv_world455.dll" target="runtimes\win-x64\native" />
-        <file src="..\opencv_files\opencv455_uwp_x86\x86\vc17\bin\opencv_world455.dll" target="runtimes\win-x86\native" />
-        <file src="..\opencv_files\opencv455_uwp_arm\x86\vc17\bin\opencv_world455.dll" target="runtimes\win-arm\native" />
-        <file src="..\opencv_files\opencv455_uwp_x64\x64\vc17\bin\opencv_img_hash455.dll" target="runtimes\win-x64\native" />
-        <file src="..\opencv_files\opencv455_uwp_x86\x86\vc17\bin\opencv_img_hash455.dll" target="runtimes\win-x86\native" />
-        <file src="..\opencv_files\opencv455_uwp_arm\x86\vc17\bin\opencv_img_hash455.dll" target="runtimes\win-arm\native" />
+        <file src="..\opencv_files\opencv460_uwp_x64\x64\vc17\bin\opencv_world460.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv460_uwp_x86\x86\vc17\bin\opencv_world460.dll" target="runtimes\win-x86\native" />
+        <file src="..\opencv_files\opencv460_uwp_arm\x86\vc17\bin\opencv_world460.dll" target="runtimes\win-arm\native" />
+        <file src="..\opencv_files\opencv460_uwp_x64\x64\vc17\bin\opencv_img_hash460.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv460_uwp_x86\x86\vc17\bin\opencv_img_hash460.dll" target="runtimes\win-x86\native" />
+        <file src="..\opencv_files\opencv460_uwp_arm\x86\vc17\bin\opencv_img_hash460.dll" target="runtimes\win-arm\native" />
     </files>
 </package>
diff --git a/nuget/OpenCvSharp4.runtime.win.nuspec b/nuget/OpenCvSharp4.runtime.win.nuspec
@@ -27,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\opencv455_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg455_64.dll" target="runtimes\win-x64\native" />
-        <file src="..\opencv_files\opencv455_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg455.dll"    target="runtimes\win-x86\native" />
+        <file src="..\opencv_files\opencv460_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg460_64.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv460_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg460.dll"    target="runtimes\win-x86\native" />
         <file src="OpenCvSharp4.runtime.win.props" target="build\net48\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" />
diff --git a/nuget/OpenCvSharp4.runtime.win.props b/nuget/OpenCvSharp4.runtime.win.props
@@ -7,7 +7,7 @@
 			<Link>dll\x86\OpenCvSharpExtern.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\opencv_videoio_ffmpeg455.dll">
+		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\opencv_videoio_ffmpeg460.dll">
 			<Link>dll\x86\opencv_videoio_ffmpeg455.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
@@ -17,7 +17,7 @@
 			<Link>dll\x64\OpenCvSharpExtern.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x64\native\opencv_videoio_ffmpeg455_64.dll">
+		<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x64\native\opencv_videoio_ffmpeg460_64.dll">
 			<Link>dll\x64\opencv_videoio_ffmpeg455_64.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
diff --git a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_aruco.cs b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_aruco.cs
@@ -38,10 +38,6 @@ public static extern ExceptionStatus aruco_estimatePoseSingleMarkers(
             int[] cornersLengths2, float markerLength, 
             IntPtr cameraMatrix, IntPtr distCoeffs, IntPtr rvecs, IntPtr tvecs, IntPtr objPoints);
 
-        [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus aruco_drawAxis(
-            IntPtr image, IntPtr cameraMatrix, IntPtr distCoeffs, IntPtr rvec, IntPtr tvec, float length);
-
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         public static extern ExceptionStatus aruco_getPredefinedDictionary(int name, out IntPtr returnValue);
 
diff --git a/src/OpenCvSharp/Modules/aruco/CvAruco.cs b/src/OpenCvSharp/Modules/aruco/CvAruco.cs
@@ -191,45 +191,6 @@ public static void DrawMarker(Dictionary dictionary, int id, int sidePixels, Out
             GC.KeepAlive(mat);
         }
 
-        /// <summary>
-        /// Draw coordinate system axis from pose estimation.
-        /// </summary>
-        /// <param name="image">input/output image. It must have 1 or 3 channels. The number of channels is not altered.</param>
-        /// <param name="cameraMatrix">input 3x3 floating-point camera matrix</param>
-        /// <param name="distCoeffs">vector of distortion coefficients (k1,k2,p1,p2[,k3[,k4,k5,k6],[s1,s2,s3,s4]]) of 4, 5, 8 or 12 elements</param>
-        /// <param name="rvec">rotation vector of the coordinate system that will be drawn.</param>
-        /// <param name="tvec">translation vector of the coordinate system that will be drawn.</param>
-        /// <param name="length">length of the painted axis in the same unit than tvec (usually in meters)</param>
-        public static void DrawAxis(InputOutputArray image, InputArray cameraMatrix, InputArray distCoeffs, InputArray rvec, InputArray tvec, float length)
-        {
-            if (image == null)
-                throw new ArgumentNullException(nameof(image));
-            if (cameraMatrix == null)
-                throw new ArgumentNullException(nameof(cameraMatrix));
-            if (distCoeffs == null)
-                throw new ArgumentNullException(nameof(distCoeffs));
-            if (rvec == null)
-                throw new ArgumentNullException(nameof(rvec));
-            if (tvec == null)
-                throw new ArgumentNullException(nameof(tvec));
-
-            image.ThrowIfDisposed();
-            cameraMatrix.ThrowIfDisposed();
-            distCoeffs.ThrowIfDisposed();
-            rvec.ThrowIfDisposed();
-            tvec.ThrowIfDisposed();
-
-            NativeMethods.HandleException(
-                NativeMethods.aruco_drawAxis(image.CvPtr, cameraMatrix.CvPtr, distCoeffs.CvPtr,
-                    rvec.CvPtr, tvec.CvPtr, length));
-
-            GC.KeepAlive(image);
-            GC.KeepAlive(cameraMatrix);
-            GC.KeepAlive(distCoeffs);
-            GC.KeepAlive(rvec);
-            GC.KeepAlive(tvec);
-        }
-
         /// <summary>
         /// Returns one of the predefined dictionaries defined in PREDEFINED_DICTIONARY_NAME
         /// </summary>
diff --git a/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj b/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj
@@ -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\opencv455_win_x64\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv455_win_x64\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv455_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv455_win_x64\x64\vc17\staticlib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x64-windows-static\lib;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv455_win_x86\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv455_win_x86\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv455_win_x86\x86\vc17\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\opencv455_win_x86\x86\vc16\staticlib;$(LibraryPath)</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv460_win_x64\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv460_win_x64\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\opencv_files\opencv460_win_x64\x64\vc16\staticlib;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\opencv_files\opencv460_win_x64\x64\vc17\staticlib;$(SolutionDir)\tesseract_files\tesseract_vcpkg\installed\x64-windows-static\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\opencv_files\opencv460_win_x86\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv460_win_x86\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\opencv_files\opencv460_win_x86\x86\vc17\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\opencv460_win_x86\x86\vc16\staticlib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -164,7 +164,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjpeg-turbo.lib;libopenjp2.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco455.lib;opencv_bgsegm455.lib;opencv_bioinspired455.lib;opencv_calib3d455.lib;opencv_ccalib455.lib;opencv_core455.lib;opencv_dnn455.lib;opencv_dnn_superres455.lib;opencv_dnn_objdetect455.lib;opencv_dpm455.lib;opencv_face455.lib;opencv_features2d455.lib;opencv_flann455.lib;opencv_fuzzy455.lib;opencv_hfs455.lib;opencv_highgui455.lib;opencv_imgcodecs455.lib;opencv_imgproc455.lib;opencv_img_hash455.lib;opencv_line_descriptor455.lib;opencv_ml455.lib;opencv_objdetect455.lib;opencv_optflow455.lib;opencv_phase_unwrapping455.lib;opencv_photo455.lib;opencv_plot455.lib;opencv_quality455.lib;opencv_reg455.lib;opencv_rgbd455.lib;opencv_saliency455.lib;opencv_shape455.lib;opencv_stereo455.lib;opencv_stitching455.lib;opencv_structured_light455.lib;opencv_superres455.lib;opencv_surface_matching455.lib;opencv_text455.lib;opencv_tracking455.lib;opencv_video455.lib;opencv_videoio455.lib;opencv_videostab455.lib;opencv_wechat_qrcode455.lib;opencv_xfeatures2d455.lib;opencv_ximgproc455.lib;opencv_xobjdetect455.lib;opencv_xphoto455.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.81.1.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libjpeg-turbo.lib;libopenjp2.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco460.lib;opencv_bgsegm460.lib;opencv_bioinspired460.lib;opencv_calib3d460.lib;opencv_ccalib460.lib;opencv_core460.lib;opencv_dnn460.lib;opencv_dnn_superres460.lib;opencv_dnn_objdetect460.lib;opencv_dpm460.lib;opencv_face460.lib;opencv_features2d460.lib;opencv_flann460.lib;opencv_fuzzy460.lib;opencv_hfs460.lib;opencv_highgui460.lib;opencv_imgcodecs460.lib;opencv_imgproc460.lib;opencv_img_hash460.lib;opencv_line_descriptor460.lib;opencv_ml460.lib;opencv_objdetect460.lib;opencv_optflow460.lib;opencv_phase_unwrapping460.lib;opencv_photo460.lib;opencv_plot460.lib;opencv_quality460.lib;opencv_reg460.lib;opencv_rgbd460.lib;opencv_saliency460.lib;opencv_shape460.lib;opencv_stereo460.lib;opencv_stitching460.lib;opencv_structured_light460.lib;opencv_superres460.lib;opencv_surface_matching460.lib;opencv_text460.lib;opencv_tracking460.lib;opencv_video460.lib;opencv_videoio460.lib;opencv_videostab460.lib;opencv_wechat_qrcode460.lib;opencv_xfeatures2d460.lib;opencv_ximgproc460.lib;opencv_xobjdetect460.lib;opencv_xphoto460.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.81.1.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>NotSet</SubSystem>
@@ -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\opencv455_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg455.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg455.dll"
-copy "$(SolutionDir)opencv_files\opencv455_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg455.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg455.dll"
+copy "$(SolutionDir)opencv_files\opencv460_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg460.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x86\opencv_videoio_ffmpeg460.dll"
+copy "$(SolutionDir)opencv_files\opencv460_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg460.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg460.dll"
 </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -207,7 +207,7 @@ copy "$(SolutionDir)opencv_files\opencv455_win_x86\x86\vc17\bin\opencv_videoio_f
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>IlmImf.lib;ippicvmt.lib;ippiw.lib;ittnotify.lib;libopenjp2.lib;libjpeg-turbo.lib;libpng.lib;libprotobuf.lib;libtiff.lib;libwebp.lib;opencv_aruco455.lib;opencv_bgsegm455.lib;opencv_bioinspired455.lib;opencv_calib3d455.lib;opencv_ccalib455.lib;opencv_core455.lib;opencv_dnn455.lib;opencv_dnn_superres455.lib;opencv_dnn_objdetect455.lib;opencv_dpm455.lib;opencv_face455.lib;opencv_features2d455.lib;opencv_flann455.lib;opencv_fuzzy455.lib;opencv_hfs455.lib;opencv_highgui455.lib;opencv_imgcodecs455.lib;opencv_imgproc455.lib;opencv_img_hash455.lib;opencv_line_descriptor455.lib;opencv_ml455.lib;opencv_objdetect455.lib;opencv_optflow455.lib;opencv_phase_unwrapping455.lib;opencv_photo455.lib;opencv_plot455.lib;opencv_quality455.lib;opencv_reg455.lib;opencv_rgbd455.lib;opencv_saliency455.lib;opencv_shape455.lib;opencv_stereo455.lib;opencv_stitching455.lib;opencv_structured_light455.lib;opencv_superres455.lib;opencv_surface_matching455.lib;opencv_text455.lib;opencv_tracking455.lib;opencv_video455.lib;opencv_videoio455.lib;opencv_videostab455.lib;opencv_wechat_qrcode455.lib;opencv_xfeatures2d455.lib;opencv_ximgproc455.lib;opencv_xobjdetect455.lib;opencv_xphoto455.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.81.1.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.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_aruco460.lib;opencv_bgsegm460.lib;opencv_bioinspired460.lib;opencv_calib3d460.lib;opencv_ccalib460.lib;opencv_core460.lib;opencv_dnn460.lib;opencv_dnn_superres460.lib;opencv_dnn_objdetect460.lib;opencv_dpm460.lib;opencv_face460.lib;opencv_features2d460.lib;opencv_flann460.lib;opencv_fuzzy460.lib;opencv_hfs460.lib;opencv_highgui460.lib;opencv_imgcodecs460.lib;opencv_imgproc460.lib;opencv_img_hash460.lib;opencv_line_descriptor460.lib;opencv_ml460.lib;opencv_objdetect460.lib;opencv_optflow460.lib;opencv_phase_unwrapping460.lib;opencv_photo460.lib;opencv_plot460.lib;opencv_quality460.lib;opencv_reg460.lib;opencv_rgbd460.lib;opencv_saliency460.lib;opencv_shape460.lib;opencv_stereo460.lib;opencv_stitching460.lib;opencv_structured_light460.lib;opencv_superres460.lib;opencv_surface_matching460.lib;opencv_text460.lib;opencv_tracking460.lib;opencv_video460.lib;opencv_videoio460.lib;opencv_videostab460.lib;opencv_wechat_qrcode460.lib;opencv_xfeatures2d460.lib;opencv_ximgproc460.lib;opencv_xobjdetect460.lib;opencv_xphoto460.lib;quirc.lib;zlib.lib;ws2_32.lib;tesseract41.lib;leptonica-1.81.1.lib;gif.lib;jpeg.lib;libpng16.lib;libwebpmux.lib;lzma.lib;tiff.lib;turbojpeg.lib;webp.lib;webpdecoder.lib;webpdemux.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>NotSet</SubSystem>
@@ -222,8 +222,8 @@ copy "$(SolutionDir)opencv_files\opencv455_win_x86\x86\vc17\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\opencv455_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg455_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg455_64.dll"
-copy "$(SolutionDir)opencv_files\opencv455_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg455_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\opencv_videoio_ffmpeg455_64.dll"</Command>
+copy "$(SolutionDir)opencv_files\opencv460_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg460_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\opencv_videoio_ffmpeg460_64.dll"
+copy "$(SolutionDir)opencv_files\opencv460_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg460_64.dll" "$(SolutionDir)test\OpenCvSharp.Tests\dll\x64\opencv_videoio_ffmpeg460_64.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/OpenCvSharpExtern/aruco.h b/src/OpenCvSharpExtern/aruco.h
diff --git a/src/uwpOpenCvSharpExtern/uwpOpenCvSharpExtern.vcxproj b/src/uwpOpenCvSharpExtern/uwpOpenCvSharpExtern.vcxproj
