Merge pull request #1290 from shimat/4.5.3

shimat · web-flow · commit b2a2f5f33f7c · 2021-07-25T10:35:54.000+09:00
4.5.3
diff --git a/.github/workflows/docker-amazonlinux.yml b/.github/workflows/docker-amazonlinux.yml
@@ -19,5 +19,5 @@ jobs:
           
       - name: docker build
         run: |
-          cd docker/al2-dotnet5-opencv4.5.1
-          docker build -t shimat/al2-dotnet5-opencv4.5.1 .
+          cd docker/al2-dotnet5-opencv4.5.3
+          docker build -t shimat/al2-dotnet5-opencv4.5.3 .
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.2
+  OPENCV_VERSION: 4.5.3
 
 jobs:
   build:
@@ -31,7 +31,7 @@ jobs:
             --output=type=docker \
             --platform=linux/arm/v7 \
             --build-arg OPENCV_VERSION \
-            ./docker/ubuntu18-dotnetcore3.1-opencv4.5.1
+            ./docker/ubuntu18-dotnetcore3.1-opencv4.5.3
 
       - name: Extract build files from Docker instance
         run: |
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.2
+  OPENCV_VERSION: 4.5.3
 
 jobs:
   build:
@@ -53,7 +53,9 @@ jobs:
             -DBUILD_opencv_python_tests=OFF \
             -DBUILD_opencv_ts=OFF \
             -DBUILD_opencv_js=OFF \
+            -DBUILD_opencv_js_bindings_generator=OFF \
             -DBUILD_opencv_app=OFF \
+            -DBUILD_opencv_barcode=OFF \
             -DBUILD_opencv_bioinspired=OFF \
             -DBUILD_opencv_ccalib=OFF \
             -DBUILD_opencv_datasets=OFF \
@@ -63,11 +65,13 @@ jobs:
             -DBUILD_opencv_gapi=ON \
             -DBUILD_opencv_intensity_transform=OFF \
             -DBUILD_opencv_mcc=OFF \
+            -DBUILD_opencv_objc_bindings_generator=OFF \
             -DBUILD_opencv_rapid=OFF \
             -DBUILD_opencv_reg=OFF \
             -DBUILD_opencv_stereo=OFF \
             -DBUILD_opencv_structured_light=OFF \
             -DBUILD_opencv_surface_matching=OFF \
+            -DBUILD_opencv_wechat_qrcode=OFF \
             -DBUILD_opencv_videostab=OFF \
             -DWITH_GSTREAMER=OFF \
             -DWITH_EIGEN=OFF \
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.2
+  OPENCV_VERSION: 4.5.3
 
 jobs:
   build:
@@ -78,11 +78,13 @@ jobs:
             -D BUILD_TESTS=OFF \
             -D BUILD_JAVA=OFF \
             -D BUILD_opencv_app=OFF \
+            -D BUILD_opencv_barcode=OFF \
             -D BUILD_opencv_java_bindings_generator=OFF \
             -D BUILD_opencv_python_bindings_generator=OFF \
             -D BUILD_opencv_python_tests=OFF \
             -D BUILD_opencv_ts=OFF \
             -D BUILD_opencv_js=OFF \
+            -D BUILD_opencv_js_bindings_generator=OFF \
             -D BUILD_opencv_bioinspired=OFF \
             -D BUILD_opencv_ccalib=OFF \
             -D BUILD_opencv_datasets=OFF \
@@ -92,11 +94,13 @@ jobs:
             -D BUILD_opencv_gapi=ON \
             -D BUILD_opencv_intensity_transform=OFF \
             -D BUILD_opencv_mcc=OFF \
+            -D BUILD_opencv_objc_bindings_generator=OFF \
             -D BUILD_opencv_rapid=OFF \
             -D BUILD_opencv_reg=OFF \
             -D BUILD_opencv_stereo=OFF \
             -D BUILD_opencv_structured_light=OFF \
             -D BUILD_opencv_surface_matching=OFF \
+            -D BUILD_opencv_wechat_qrcode=OFF \
             -D BUILD_opencv_videostab=OFF \
             -D WITH_GSTREAMER=OFF \
             -D OPENCV_ENABLE_NONFREE=ON \
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,7 +8,7 @@ on:
       - master
 
 env:
-  OPENCV_VERSION: 4.5.2
+  OPENCV_VERSION: 4.5.3
 
 jobs:
   build:
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ This issue may be helpful: https://github.com/shimat/opencvsharp/issues/920
 If you do not use NuGet, get DLL files from the [release page](https://github.com/shimat/opencvsharp/releases).
 
 ## Target OpenCV
-* [OpenCV 4.5.2](http://opencv.org/) with [opencv_contrib](https://github.com/opencv/opencv_contrib)
+* [OpenCV 4.5.3](http://opencv.org/) with [opencv_contrib](https://github.com/opencv/opencv_contrib)
 
 ## Requirements
 * [.NET Framework 4.6.1](http://www.microsoft.com/ja-jp/download/details.aspx?id=1639) / [.NET Core 2.0](https://www.microsoft.com/net/download) / [Mono](http://www.mono-project.com/Main_Page)
diff --git a/docker/al2-dotnet5-opencv4.5.3/Dockerfile b/docker/al2-dotnet5-opencv4.5.3/Dockerfile
@@ -1,6 +1,6 @@
 FROM public.ecr.aws/lambda/dotnet:5.0
 
-ENV OPENCV_VERSION=4.5.1
+ENV OPENCV_VERSION=4.5.3
 
 WORKDIR /
 
@@ -32,7 +32,9 @@ RUN cd opencv && mkdir build && cd build && \
     -D BUILD_TESTS=OFF \
     -D BUILD_JAVA=OFF \
     -D BUILD_opencv_app=OFF \
+    -D BUILD_opencv_barcode=OFF \
     -D BUILD_opencv_java_bindings_generator=OFF \
+    -D BUILD_opencv_js_bindings_generator=OFF \
     -D BUILD_opencv_python_bindings_generator=OFF \
     -D BUILD_opencv_python_tests=OFF \
     -D BUILD_opencv_ts=OFF \
@@ -46,13 +48,15 @@ RUN cd opencv && mkdir build && cd build && \
     -D BUILD_opencv_gapi=OFF \
     -D BUILD_opencv_intensity_transform=OFF \
     -D BUILD_opencv_mcc=OFF \
+    -D BUILD_opencv_objc_bindings_generator=OFF \
     -D BUILD_opencv_rapid=OFF \
     -D BUILD_opencv_reg=OFF \
     -D BUILD_opencv_stereo=OFF \
     -D BUILD_opencv_structured_light=OFF \
     -D BUILD_opencv_surface_matching=OFF \
     -D BUILD_opencv_videostab=OFF \
-    -D WITH_GSTREAMER=OFF \ 
+    -D BUILD_opencv_wechat_qrcode=OFF \
+    -D WITH_GSTREAMER=OFF \
     -D OPENCV_ENABLE_NONFREE=ON \
     .. && make -j8 && make install
 
diff --git a/docker/ubuntu18-dotnetcore3.1-opencv4.5.3/Dockerfile b/docker/ubuntu18-dotnetcore3.1-opencv4.5.3/Dockerfile
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/dotnet/sdk:3.1-bionic
 
 ENV DEBIAN_FRONTEND=noninteractive
-ARG OPENCV_VERSION=4.5.1
+ARG OPENCV_VERSION=4.5.3
 
 WORKDIR /
 
@@ -59,7 +59,9 @@ RUN cd opencv && mkdir build && cd build && \
     -D BUILD_TESTS=OFF \
     -D BUILD_JAVA=OFF \
     -D BUILD_opencv_app=OFF \
+    -D BUILD_opencv_barcode=OFF \
     -D BUILD_opencv_java_bindings_generator=OFF \
+    -D BUILD_opencv_js_bindings_generator=OFF \
     -D BUILD_opencv_python_bindings_generator=OFF \
     -D BUILD_opencv_python_tests=OFF \
     -D BUILD_opencv_ts=OFF \
@@ -73,12 +75,14 @@ RUN cd opencv && mkdir build && cd build && \
     -D BUILD_opencv_gapi=OFF \
     -D BUILD_opencv_intensity_transform=OFF \
     -D BUILD_opencv_mcc=OFF \
+    -D BUILD_opencv_objc_bindings_generator=OFF \
     -D BUILD_opencv_rapid=OFF \
     -D BUILD_opencv_reg=OFF \
     -D BUILD_opencv_stereo=OFF \
     -D BUILD_opencv_structured_light=OFF \
     -D BUILD_opencv_surface_matching=OFF \
     -D BUILD_opencv_videostab=OFF \
+    -D BUILD_opencv_wechat_qrcode=OFF \
     -D WITH_GSTREAMER=OFF \
     -D OPENCV_ENABLE_NONFREE=ON \
     .. && make -j$(nproc) && make install && ldconfig
diff --git a/download_opencv_windows.ps1 b/download_opencv_windows.ps1
@@ -1,5 +1,5 @@
-$tag = "4.5.2.20210404"
-$version = "452"
+$tag = "4.5.3.20210711"
+$version = "453"
 $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
@@ -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\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" />
+        <file src="..\opencv_files\opencv453_uwp_x64\x64\vc16\bin\opencv_world453.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv453_uwp_x86\x86\vc16\bin\opencv_world453.dll" target="runtimes\win-x86\native" />
+        <file src="..\opencv_files\opencv453_uwp_arm\x86\vc16\bin\opencv_world453.dll" target="runtimes\win-arm\native" />
+        <file src="..\opencv_files\opencv453_uwp_x64\x64\vc16\bin\opencv_img_hash453.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv453_uwp_x86\x86\vc16\bin\opencv_img_hash453.dll" target="runtimes\win-x86\native" />
+        <file src="..\opencv_files\opencv453_uwp_arm\x86\vc16\bin\opencv_img_hash453.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\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="..\opencv_files\opencv453_win_x64\x64\vc16\bin\opencv_videoio_ffmpeg453_64.dll" target="runtimes\win-x64\native" />
+        <file src="..\opencv_files\opencv453_win_x86\x86\vc16\bin\opencv_videoio_ffmpeg453.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" />
diff --git a/nuget/OpenCvSharp4.runtime.win.props b/nuget/OpenCvSharp4.runtime.win.props
@@ -7,8 +7,8 @@
 			<Link>dll\x86\OpenCvSharpExtern.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg452.dll">
-			<Link>dll\x86\opencv_videoio_ffmpeg452.dll</Link>
+		<Content Include="$(NativeDlls)\win-x86\native\opencv_videoio_ffmpeg453.dll">
+			<Link>dll\x86\opencv_videoio_ffmpeg453.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
@@ -17,8 +17,8 @@
 			<Link>dll\x64\OpenCvSharpExtern.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg452_64.dll">
-			<Link>dll\x64\opencv_videoio_ffmpeg452_64.dll</Link>
+		<Content Include="$(NativeDlls)\win-x64\native\opencv_videoio_ffmpeg453_64.dll">
+			<Link>dll\x64\opencv_videoio_ffmpeg453_64.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
diff --git a/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj b/src/OpenCvSharpExtern/OpenCvSharpExtern.vcxproj
diff --git a/src/uwpOpenCvSharpExtern/uwpOpenCvSharpExtern.vcxproj b/src/uwpOpenCvSharpExtern/uwpOpenCvSharpExtern.vcxproj
