Skip to content

(4.x) Merge 3.4#20983

Merged
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 30, 2021
Merged

(4.x) Merge 3.4#20983
alalek merged 16 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 30, 2021 •
edited
Loading

#20958 from noahstier:3.4_tvl1_optimization
#20960 from alalek:fix_icc_support_3.4
#20961 from alalek:fix_msvc_clang
#20967 from alalek:fix_msvc_clang_unused_parameter
#20969 from alalek:fix_msvc_clang_warning_noreturn
#20971 from alalek:cmake_build_type_use_release
#20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4

(4.x) Merge 3.4
Previous "Merge 3.4": #20928

Details 
buildworker:Win64 OpenCL=windows-2
Xbuildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=powerpc64le
Xbuild_image:Custom=ubuntu-openvino-2019r3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.4.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2021.1.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.2.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.1:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=ubuntu-vulkan:16.04
Xbuildworker:Custom=linux-4
Xbuild_image:Custom=fedora:28
Xbuild_image:Custom=ubuntu-cuda:16.04
Xbuild_image:Custom=ubuntu-clang:18.04
Xbuild_image:Custom=ubuntu:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=mips64el

Xbuild_image:Custom Mac=openvino-2019r3.0
Xbuild_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
Xbuild_image:Custom Mac=openvino-2021.4.0
build_image:Custom Mac=openvino-2021.4.1
test_modules:Custom Mac=dnn,gapi,python2,python3,java

Xbuild_image:Custom Win=openvino-2019r3.0
Xbuild_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
Xbuild_image:Custom Win=openvino-2021.4.0
build_image:Custom Win=openvino-2021.4.1
buildworker:Custom Win=windows-3
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules:Custom Win=dnn,gapi,python2,python3,java
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF
Xbuild_image:Custom Win=msvs2017
Xbuild_image:Custom Win=msvs2019

noahstier and others added 16 commits October 27, 2021 12:01
@noahstier
tvl1 cuda optflow optimization
84a8157
@alalek
Merge pull request opencv#20958 from noahstier:3.4_tvl1_optimization
d059cc7
@alalek
cmake: fix popcnt detection with Intel Compiler
5dfe65d
@alalek
build(icc): fix nodiscard attribute handling
1726bb6
@alalek
core(simd): fix compilation with MSVC-Clang
75e2ba5
@alalek
Merge pull request opencv#20960 from alalek:fix_icc_support_3.4
770d3ea
@alalek
Merge pull request opencv#20961 from alalek:fix_msvc_clang
6bd143d
@alalek
build: fix MSVC-Clang warnings about unused parameters in stubs
d612c72
@alalek
core: eliminate Winvalid-noreturn in base.hpp
a49cda6
@alalek
Merge pull request opencv#20967 from alalek:fix_msvc_clang_unused_par…
0b6e360 
…ameter
@alalek
Merge pull request opencv#20969 from alalek:fix_msvc_clang_warning_no…
74cc63b 
…return
@alalek
cmake: use CMAKE_BUILD_TYPE=Release by default
e5647cf
@alalek
Merge pull request opencv#20971 from alalek:cmake_build_type_use_release
0e9453a
@alalek
highgui: drop invalid cvGetWindowImageRect
0ee61d1 
- return type is C++ template
- removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly
@alalek
Merge pull request opencv#20980 from alalek:highgui_fix_cvGetWindowIm…
bce76a7 
…ageRect_3.4
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7b57df0
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 30, 2021

👍

@alalek alalek merged commit 7b57df0 into opencv:master Oct 30, 2021
@alalek alalek mentioned this pull request Nov 5, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alalek @noahstier