Skip to content

Merge 3.4#18769

Merged
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 10, 2020
Merged

Merge 3.4#18769
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 10, 2020 •
edited
Loading

#18732 from junxnone:master
#18746 from alalek:backport_18741
#18752 from alalek:dnn_defines_openvino_2021.1.0
#18753 from catree:fix_FindOpenBLAS_typo
#18764 from alalek:doxygen_image_path
#18765 from GArik:tutorials

Previous "Merge 3.4": #18738

buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
buildworker:Custom=linux-4
Xbuild_image:Custom=javascript-simd:1.39.16
build_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
#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
build_image:Custom Mac=openvino-2021.1.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
build_image:Custom Win=openvino-2021.1.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

junxnone and others added 11 commits November 6, 2020 16:38
@junxnone
fix truncate threshold example display issue in py_tutorials
ad71a16 
Signed-off-by: junxnone <junchen0102@gmail.com>
@alalek
Merge pull request opencv#18732 from junxnone:master
127a44f
@rkazants @alalek
Use explicit opset of Unsqueeze from nGraph
bb5b628 
backporting commit eb24575
@alalek
Merge pull request opencv#18746 from alalek:backport_18741
caa1658
@alalek
dnn: use OpenVINO 2021.1 defines
bed5deb
@catree
Fix typo in OpenCVFindOpenBLAS.cmake file.
df7bf9a
@alalek
Merge pull request opencv#18753 from catree:fix_FindOpenBLAS_typo
083edb2
@alalek
Merge pull request opencv#18752 from alalek:dnn_defines_openvino_2021…
c3e7a23 
….1.0
@alalek
doxygen: adjust IMAGE_PATH, allow custom OPENCV_DOCS_EXTRA_IMAGE_PATH
a104e7c 
- add opencv/modules
- add opencv_contrib/modules
@GArik
Fix code snippets inclusion into video tutorials
08271e5 
Code snippets need a section marked with ### above to render properly
@alalek
Merge pull request opencv#18764 from alalek:doxygen_image_path
c694171
@alalek alalek mentioned this pull request Nov 10, 2020
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 10, 2020

👍

@alalek alalek merged commit ef32d7f into opencv:master Nov 10, 2020
@alalek alalek mentioned this pull request Nov 13, 2020
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 @junxnone @rkazants @catree @GArik