Skip to content

Merge 3.4#19314

Merged
alalek merged 21 commits intoopencv:masterfrom
alalek:merge-3.4
Jan 12, 2021
Merged

Merge 3.4#19314
alalek merged 21 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jan 12, 2021 •
edited
Loading

#19216 from terfendail:wasm_fall
#19220 from alalek:dnn_tf_importer_error_reporting
#19239 from justinchuby:justinchuby-doc-typo-hough-lines
#19248 from LaurentBerger:forum
#19258 from notmatthancock:doc/update-sift-patent-blurb
#19291 from gpiffault:docs-js_usage-fix_imshow
#19296 from raaldrid:Doc_issue_fix_18836_FULL
#19297 from raaldrid:Template_Match_Tutorial_fix_17739
#19300 from alkasm:patch-2
#19301 from krush11:3.4

Previous "Merge 3.4": #19217

Details 
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
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
#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
build_image:Custom Mac=openvino-2021.2.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
build_image:Custom Win=openvino-2021.2.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

alalek and others added 21 commits December 26, 2020 15:31
@alalek
dnn: improve debugging of TensorFlow parsing errors
55f06b7
@justinchuby
Fix typo in hough_lines tutorial
8f66dad 
Argument `minLinLength` -> `minLineLength`
@alalek
Merge pull request opencv#19239 from justinchuby:justinchuby-doc-typo…
5b598c1 
…-hough-lines
@alalek
copyright: 2021
4f9cb38
@notmatthancock
Merge pull request opencv#19258 from notmatthancock:doc/update-sift-p…
2d2d72a 
…atent-blurb

* Remove sentences about SIFT patent and code location

* Add note about patent in opencv-specific section
@gpiffault
docs(tutorial_js_usage): fix imshow usage
0043d9b
@krush11
added multi-config to regexp
87b3b48
@terfendail
Inlined WASM fallback intrinsics to avoid using of V_TypeTraits
8f653ba
@LaurentBerger
update forum link
9fb48d5
@raaldrid
Solution to documentation issue opencv#18836
f98e567
@alalek
Merge pull request opencv#19220 from alalek:dnn_tf_importer_error_rep…
2775099 
…orting
@raaldrid
Template Matching Tutorial issue fix opencv#17739
380009a
@alalek
Merge pull request opencv#19248 from LaurentBerger:forum
058460d
@alalek
Merge pull request opencv#19291 from gpiffault:docs-js_usage-fix_imshow
5389309
@alalek
Merge pull request opencv#19296 from raaldrid:Doc_issue_fix_18836_FULL
83e14f6
@alalek
Merge pull request opencv#19297 from raaldrid:Template_Match_Tutorial…
89ef676 
…_fix_17739
@alalek
Merge pull request opencv#19301 from krush11:3.4
62420b9
@alkasm
hotfix: call isOpened() in python bg sub tutorial
e3856df 
opencv#19299
@alalek
Merge pull request opencv#19216 from terfendail:wasm_fall
72894a1
@alalek
Merge pull request opencv#19300 from alkasm:patch-2
fbcc532
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
d3bc563
@alalek alalek mentioned this pull request Jan 12, 2021
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jan 12, 2021

👍

@alalek alalek merged commit d3bc563 into opencv:master Jan 12, 2021
@alalek alalek mentioned this pull request Jan 16, 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.

9 participants

@alalek @justinchuby @notmatthancock @gpiffault @krush11 @terfendail @LaurentBerger @raaldrid @alkasm