Skip to content

(4.x) Merge 3.4#20387

Merged
alalek merged 10 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 10, 2021
Merged

(4.x) Merge 3.4#20387
alalek merged 10 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 10, 2021 •
edited
Loading

#20368 from mightbxg:bugfix_imshowqt
#20373 from kikaxa:mjpeg-VideoInputStream-alignment-fix
#20374 from cesarpgouveia:bugfix/fix_load_onnxModel_debug
#20381 from berak:dnn_samples_fix_colorization_links

Previous "Merge 3.4": #20358

Details 
Xbuildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4,linux-6
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker: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
#build_image:Custom=ubuntu-openvino-2021.3.0:20.04
#build_image:Custom=ubuntu-openvino-2021.4.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
Xbuild_image:Custom Mac=openvino-2021.2.0
Xbuild_image:Custom Mac=openvino-2021.3.0
build_image:Custom Mac=openvino-2021.4.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
Xbuild_image:Custom Win=openvino-2021.2.0
Xbuild_image:Custom Win=openvino-2021.3.0
build_image:Custom Win=openvino-2021.4.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 10 commits July 4, 2021 21:10
@alalek
release: OpenCV 3.4.15
5917089
@alalek
Merge tag '3.4.15'
9a9954a
@mightbxg
fix scale problem in DefaultViewPort::controlImagePosition()
5627a0c
@kikaxa
fix videoio/src/container_avi.cpp VideoInputStream alignment
9265354
@alalek
Merge pull request opencv#20373 from kikaxa:mjpeg-VideoInputStream-al…
4788de7 
…ignment-fix
@alalek
Merge pull request opencv#20368 from mightbxg:bugfix_imshowqt
1ba6cd8
@berak
dnn: update links for the colorization samples
fd16222
@alalek
Merge pull request opencv#20381 from berak:dnn_samples_fix_colorizati…
6af2fae 
…on_links
@cesarpgouveia @alalek
Merge pull request opencv#20374 from cesarpgouveia:bugfix/fix_load_on…
167a120 
…nxModel_debug

* Fix bug while loading onnx model in debug

* dnn: fix other .at using

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
9e42e04
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 10, 2021

👍

@alalek alalek merged commit 9e42e04 into opencv:master Jul 10, 2021
@alalek alalek mentioned this pull request Jul 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.

6 participants

@alalek @berak @parashu28 @mightbxg @kikaxa @cesarpgouveia