Skip to content

Merge 3.4#18842

Merged
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 17, 2020
Merged

Merge 3.4#18842
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 17, 2020 •
edited
Loading

#18145 from sl-sergei:fix_17914
#18296 from sl-sergei:fix_16783
#18782 from alalek:issue_18779
#18802 from aitikgupta:typo
#18824 from alalek:update_version_3.4.13-pre
#18828 from ichisadashioko:fix-calibration-sample-typo
#18830 from l-bat:issue_18785
#18833 from sl-sergei:disable_conv1d_wb_test
#18834 from l-bat:update_reducemax
#18839 from alalek:update_libjpeg-turbo
#18840 from alalek:dnn_test_skip_myriad_gather_multi_output

Previous "Merge 3.4": #18800

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_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

aitikgupta and others added 22 commits November 14, 2020 10:54
@aitikgupta
Small typo-fix
05c011e
@alalek
Merge pull request opencv#18802 from aitikgupta:typo
564d1a0
@l-bat
[ONNX] Added handler for int32 tensors
3a184ae
@sl-sergei
Merge pull request opencv#18296 from sl-sergei:fix_16783
2b82f8f 
Fix loading issue for Faster RCNN model from opencv#16783

* Add a reproducer with multi-output Gather

* Fix an issue with ONNX graph simplifier

* fix build

* Move checks to correct class

* Minor changes for better code appearence
@sl-sergei
Add fixes and tests for different layers
32e7ef8
@alalek
Merge pull request opencv#18830 from l-bat:issue_18785
025a964
@sl-sergei
disable Conv1d test on NGRAPH/MYRIAD
3cdf926
@l-bat
[ONNX] Added Reduce ops for batch and channel
72d0608
@alalek
core: fix F16C compilation check
2b558a3
@ichisadashioko
Fix typo 'Applicatioin'
fe9a8eb
@alalek
Merge pull request opencv#18828 from ichisadashioko:fix-calibration-s…
8357e86 
…ample-typo
@alalek
3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
d266fee 
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.6
@alalek
Merge pull request opencv#18833 from sl-sergei:disable_conv1d_wb_test
8e1e08e
@alalek
Merge pull request opencv#18782 from alalek:issue_18779
b645fc1
@alalek
dnn(test): skip gather_multi_output test on Myriad
474a672
@alalek
Merge pull request opencv#18840 from alalek:dnn_test_skip_myriad_gath…
34909d9 
…er_multi_output
@alalek
Merge pull request opencv#18834 from l-bat:update_reducemax
f7e8dc7
@alalek
Merge pull request opencv#18839 from alalek:update_libjpeg-turbo
a783bf4 
3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
@alalek
Merge pull request opencv#18145 from sl-sergei:fix_17914
4f3130f
@alalek
pre: OpenCV 3.4.13 (version++)
9485113
@alalek
Merge pull request opencv#18824 from alalek:update_version_3.4.13-pre
301c078
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
ce8027c
This was referenced Nov 17, 2020
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 17, 2020

👍

@alalek alalek merged commit ce8027c into opencv:master Nov 17, 2020
@alalek alalek mentioned this pull request Nov 20, 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 @aitikgupta @l-bat @sl-sergei @ichisadashioko