Skip to content

(4.x) Merge 3.4#20884

Merged
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 15, 2021
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 15, 2021 •
edited
Loading

#20740 from Nicholas-Ho-arm:3.4_SymmColumnVec_32f8u
#20834 from sthalik:msvc-shared-library-static-crt
#20859 from rogday:sub_const_fix
#20860 from rogday:sum_fix
#20867 from alalek:fix_CV_POPCNT_U64_msvs
#20868 from icestraw:fix-type-error-of-slice-indices

Previous "Merge 3.4": #20844

Details 
Xci_branch=merge-3.4
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

alalek and others added 14 commits October 8, 2021 18:31
@alalek
release: OpenCV 3.4.16
b1cf550
@alalek
Merge tag '3.4.16'
62252d1
@rogday
fix const - input and remove unimplemented function
a9d7b6e
@rogday
change asserts for Sum
238dbff
@alalek
Merge pull request opencv#20859 from rogday:sub_const_fix
a02e90d
@alalek
Merge pull request opencv#20860 from rogday:sum_fix
53d6c9b
@sthalik
fix link error on shared libs with -MT
3d93675
@alalek
core: ensure 'int' result from CV_POPCNT_U64(x)
982503e
@alalek
Merge pull request opencv#20834 from sthalik:msvc-shared-library-stat…
7c0b26e 
…ic-crt
@alalek
Merge pull request opencv#20867 from alalek:fix_CV_POPCNT_U64_msvs
3c8cadf
@icestraw
fix type error of slice indices
e4a87f2
@alalek
Merge pull request opencv#20868 from icestraw:fix-type-error-of-slice…
0b5cbce 
…-indices
@Nicholas-Ho-arm
Merge pull request opencv#20740 from Nicholas-Ho-arm:3.4_SymmColumnVe…
bd0732b 
…c_32f8u

* Add SymmColumnVec_32f8u

* Fix double to float warnings
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
31c40fa
This was referenced Oct 15, 2021
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 15, 2021

👍

@alalek alalek merged commit 31c40fa into opencv:master Oct 15, 2021
@alalek alalek mentioned this pull request Oct 23, 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.

5 participants

@alalek @rogday @sthalik @icestraw @Nicholas-Ho-arm