Merge pull request #597 from asenyaev/asen/3.4.17_release

asenyaev · web-flow · commit dd73e24e7efe · 2021-12-27T19:41:03.000+03:00
Updated submodules to 3.4.17 release
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit b1cf5501233405de3ea5926d1d688e421b337458
+Subproject commit 631126c77ade2428cc82aced42bdc4166ac2e817
diff --git a/opencv_contrib b/opencv_contrib
@@ -1 +1 @@
-Subproject commit 02c2b56c44503e983c3eacd5b79744a24f433c36
+Subproject commit e0db5fde1d4f688f9cab3d33862cfcf561bd754e
diff --git a/opencv_extra b/opencv_extra
@@ -1 +1 @@
-Subproject commit 38d49adaabb08618ff9fb224004362de80fdcbcc
+Subproject commit b2e7c8ac8fedbce149c4b98ca8c087f1a5dfd5e2
diff --git a/setup.py b/setup.py
@@ -148,6 +148,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
`@@ -148,6 +148,7 @@ def main():`
`148`	`148`	`"-DBUILD_PERF_TESTS=OFF",`
`149`	`149`	`"-DBUILD_DOCS=OFF",`
`150`	`150`	`"-DPYTHON3_LIMITED_API=ON",`
	`151`	`+ "-DBUILD_OPENEXR=ON",`
`151`	`152`	`]`
`152`	`153`	`+ (`
`153`	`154`	`# If it is not defined 'linker flags: /machine:X86' on Windows x64`