Merge pull request #598 from asenyaev/asen/4.5.5_release

asenyaev · web-flow · commit 569acce6b5d8 · 2021-12-27T19:40:57.000+03:00
Updated submodules to 4.5.5 release
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit 4223495e6cd67011f86b8ecd9be1fa105018f3b1
+Subproject commit dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 2bc3e1a169afd2675ef68221176f32cc0ea5427a
+Subproject commit 49e8f123ca08e76891856a1ecce491b62d08ba20
diff --git a/opencv_extra b/opencv_extra
@@ -1 +1 @@
-Subproject commit 822ee11240b969e98e20546663bc481a5e7089cc
+Subproject commit 37294e3c876a72c992d4718b9bbfc8346b9e779a
diff --git a/setup.py b/setup.py
@@ -160,6 +160,7 @@ def main():
             "-DBUILD_PERF_TESTS=OFF",
             "-DBUILD_DOCS=OFF",
             "-DPYTHON3_LIMITED_API=ON",
+            "-DBUILD_OPENEXR=ON",
         ]
         + (
             # If it is not defined 'linker flags: /machine:X86' on Windows x64

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ def main():`
`160`	`160`	`"-DBUILD_PERF_TESTS=OFF",`
`161`	`161`	`"-DBUILD_DOCS=OFF",`
`162`	`162`	`"-DPYTHON3_LIMITED_API=ON",`
	`163`	`+ "-DBUILD_OPENEXR=ON",`
`163`	`164`	`]`
`164`	`165`	`+ (`
`165`	`166`	`# If it is not defined 'linker flags: /machine:X86' on Windows x64`