Skip to content

(4.x) Merge 3.4#20115

Merged
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4
May 18, 2021
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented May 18, 2021 •
edited
Loading

#20033 from berak:dnn_openpose_py
#20049 from jstaahl:jstaahl-static-inits
#20053 from berak:core_mat_ptr_vec
#20071 from rogday:depth_fallback_doc
#20085 from changh95:fix_typo_calib3d_sample_code
#20088 from alalek:cmake_module_linker_flags
#20097 from komakai:fix_qrcode_test

Previous "Merge 3.4": #20021

Details 
Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
#buildworker: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
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#build_image:Custom=ubuntu-openvino-2021.1.0:20.04
#build_image:Custom=ubuntu-openvino-2021.2.0:20.04
#build_image:Custom=ubuntu-openvino-2021.3.0:20.04
#buildworker:Custom=linux-1
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_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
build_image:Custom Mac=openvino-2021.3.0
#build_image:Custom Win=openvino-2019r3.0
#build_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
build_image:Custom Win=openvino-2021.3.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

berak and others added 15 commits May 5, 2021 10:39
@berak
samples/dnn: better errormsg in openpose.py
1bced43
@alalek
Merge pull request opencv#20033 from berak:dnn_openpose_py
b1dc7ed
@jstaahl-sc
Remove static initializers caused by templated static member.
158b13e
@berak
core: add missing implementation for Mat::ptr(Vec)
302c235
@alalek
Merge pull request opencv#20053 from berak:core_mat_ptr_vec
dde029f
@alalek
Merge pull request opencv#20049 from jstaahl:jstaahl-static-inits
b335fe6
@rogday
Document imwrite depth fallback
1d7d18a
@alalek
Merge pull request opencv#20071 from rogday:depth_fallback_doc
699b4b9
@alalek
cmake: fix handling of CMAKE_MODULE_LINKER_FLAGS
901ed55
@changh95
fix typo 'undistorsed'->'undistorted'
101d507
@alalek
Merge pull request opencv#20088 from alalek:cmake_module_linker_flags
125f890
@alalek
Merge pull request opencv#20085 from changh95:fix_typo_calib3d_sample…
72655a9 
…_code
@komakai
Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test
e53a4ce
@alalek
Merge pull request opencv#20097 from komakai:fix_qrcode_test
1ae16be
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
7d66f1e
@alalek
Copy link
Copy Markdown
Member Author

alalek commented May 18, 2021

👍

@alalek alalek merged commit 7d66f1e into opencv:master May 18, 2021
@alalek alalek mentioned this pull request May 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.

6 participants

@alalek @berak @jstaahl-sc @rogday @changh95 @komakai