From 4af87025c9642b721442c490ed8ff06f18653486 Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Sat, 25 Dec 2021 15:43:25 +0300 Subject: [PATCH 1/2] Updated commits to 3.4.17 release --- opencv | 2 +- opencv_contrib | 2 +- opencv_extra | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opencv b/opencv index b1cf5501..631126c7 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit b1cf5501233405de3ea5926d1d688e421b337458 +Subproject commit 631126c77ade2428cc82aced42bdc4166ac2e817 diff --git a/opencv_contrib b/opencv_contrib index 02c2b56c..e0db5fde 160000 --- a/opencv_contrib +++ b/opencv_contrib @@ -1 +1 @@ -Subproject commit 02c2b56c44503e983c3eacd5b79744a24f433c36 +Subproject commit e0db5fde1d4f688f9cab3d33862cfcf561bd754e diff --git a/opencv_extra b/opencv_extra index 38d49ada..b2e7c8ac 160000 --- a/opencv_extra +++ b/opencv_extra @@ -1 +1 @@ -Subproject commit 38d49adaabb08618ff9fb224004362de80fdcbcc +Subproject commit b2e7c8ac8fedbce149c4b98ca8c087f1a5dfd5e2 From e8811044c9866d1dbd0e9253e2bec13c7dc44b08 Mon Sep 17 00:00:00 2001 From: Andrey Senyaev Date: Sun, 26 Dec 2021 22:02:16 +0300 Subject: [PATCH 2/2] Added openexr build flag --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ca6b2ff5..38ae8078 100644 --- 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