Skip to content

Merge 3.4#16585

Merged
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4
Feb 14, 2020
Merged

Merge 3.4#16585
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 14, 2020

#16516 from alalek:dnn_dump_network
#16549 from rayonnant14:objdetect_QRCode_issue_memory_allocation
#16552 from dkurt:3.4_docs
#16559 from alalek:cmake_msvc_mp_customize
#16567 from alalek:dnn_updates_from_openvino_2020.1
#16580 from dkurt:fix_14566

Previous "Merge 3.4": #16548

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#buildworker:Custom=linux-2
#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
#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.1.0
#build_image:Custom Win=openvino-2019r3.0
build_image:Custom Win=openvino-2020.1.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 14, 2020

👍

@alalek alalek merged commit f3237fd into opencv:master Feb 14, 2020
@alalek alalek mentioned this pull request Feb 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants