Skip to content

Merge 3.4#19181

Merged
alalek merged 15 commits intoopencv:masterfrom
alalek:merge-3.4
Dec 20, 2020
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 20, 2020 •
edited
Loading

#18604 from vrabaud:master
#19164 from fpetrogalli:tranform_16u
#19170 from vrabaud:3.4
#19175 from alalek:issue_18520
#19176 from alalek:issue_19131
#19177 from alalek:doxygen_drop_TCL_SUBST
#19180 from alalek:fixup_19161

Previous "Merge 3.4": #19167

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

vrabaud and others added 15 commits December 19, 2020 08:22
@vrabaud
Fix comment typos.
4c75b1c
@alalek
Merge pull request opencv#19170 from vrabaud:3.4
5cd852f
@alalek
imgproc: add rotatedRectangleIntersection empty input handling
17faee5
@alalek
docs(core): fix process_video_frame() code snippet
3359bdc
@alalek
doxygen: drop deprecated TCL_SUBST
e9a4734
@vrabaud
Replace FLANNException by CV_Error.
ff21137
@alalek
Merge pull request opencv#18604 from vrabaud:master
c84d2cb
@alalek
[cv::transform] Enable CV_SIMD for the 16U case on AArch64.
c526705
@alalek
Merge pull request opencv#19164 from fpetrogalli:tranform_16u
663bd73
@alalek
Merge pull request opencv#19175 from alalek:issue_18520
70d8201
@alalek
Merge pull request opencv#19176 from alalek:issue_19131
dd276db
@alalek
Merge pull request opencv#19177 from alalek:doxygen_drop_TCL_SUBST
c555a67
@alalek
js(build): fix generator with Python3
a6f14ca 
- class_info.props is a 'list'
@alalek
Merge pull request opencv#19180 from alalek:fixup_19161
e6c9291
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6659d55
@alalek alalek mentioned this pull request Dec 20, 2020
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 20, 2020

👍

@alalek alalek merged commit 6659d55 into opencv:master Dec 20, 2020
@alalek alalek mentioned this pull request Dec 25, 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.

2 participants

@alalek @vrabaud