Skip to content

Merge 3.4 #19465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 12 commits into from
Feb 6, 2021
Merged

Merge 3.4 #19465

merged 12 commits into from
Feb 6, 2021

Conversation

@alalek
Copy link
Member

@alalek alalek commented Feb 5, 2021 •
edited
Loading

#19407 from rayonnant14:issue_19363
#19419 from Liangda-w:patch-1
#19428 from alalek:dnn_drop_misbehaved_clamp
#19435 from l-bat:lb/onnx_normalize
#19440 from paroj:pyexcept
#19443 from asmorkalov:as/guard_nonfree
#19449 from SamFC10:tf-leakyrelu

Previous "Merge 3.4": #19431

buildworker:Win64 OpenCL=windows-2
buildworker:Docs=linux-1,linux-2,linux-4,linux-6
build_image:Docs=docs-js
Xbuild_image:Custom=javascript
Xbuildworker: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
#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

Liangda-w and others added 11 commits February 1, 2021 09:17
@Liangda-w
Merge pull request opencv#19419 from Liangda-w:patch-1
b08d67c 
* Fix error in documentation for RGB->HSV convertion

* Update colors.markdown
@l-bat
Added ONNX NormalizeL2 subgraph
68eb54d
@asmorkalov
Guard non-free usage in stitching as contrib can be built without it.
0016c25
@alalek
Merge pull request opencv#19443 from asmorkalov:as/guard_nonfree
23734af
@paroj
python: also catch general c++ exceptions
6c1a433 
they might be thrown from third-party code (notably Ogre in the ovis
module).
While Linux is kind enough to print them, they cause instant termination
on Windows.
Arguably, they do not origin from OpenCV itself, but still this helps
understanding what went wrong when calling an OpenCV function.
@alalek
Merge pull request opencv#19435 from l-bat:lb/onnx_normalize
0a86ddc
@alalek
Merge pull request opencv#19440 from paroj:pyexcept
863ecde
@alalek
dnn: rename clamp() => normalize_axis()
83aa711
@jebastin-nadar
Merge pull request opencv#19449 from SamFC10:tf-leakyrelu
09d2ca1 
* add LeakyRelu to tf-importer

* fix whitespace error

* added test for leakyrelu
@alalek
Merge pull request opencv#19428 from alalek:dnn_drop_misbehaved_clamp
4f08bb5
@rayonnant14 @alalek
Merge pull request opencv#19407 from rayonnant14:issue_19363
0be18f5 
QRCodeDetector::decodeMulti() fixed invalid usage fixedType()

* fixed invalid usage fixedType()
changed default barcode type to CV_8UC1
added tests
added assert in case multi channel straight barcode input

* deleted extra wrap into OutputArray

* fix warnings

* objdetect(qr): remove unnecessary checks

Co-authored-by: Alexander Alekhin <[email protected]>
@alalek alalek mentioned this pull request Feb 5, 2021
Merged
@alalek
Copy link
Member Author

alalek commented Feb 6, 2021

👍

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

7 participants

@alalek @Liangda-w @l-bat @asmorkalov @paroj @jebastin-nadar @rayonnant14