Skip to content

Merge 3.4#17875

Merged
alalek merged 5 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 17, 2020
Merged

Merge 3.4#17875
alalek merged 5 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 17, 2020 •
edited
Loading

#17865 from alalek:add_missing_check_17036

Previous "Merge 3.4": #17866

Xbuild_image:Custom Win=winpack-dldt-2020.4
Xbuild_image:Custom Win=winpack-dldt-2020.3

buildworker:Win64 OpenCL=windows-2
Xbuildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
Xbuild_image:Custom=javascript
#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
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
build_image:Custom Mac=openvino-2020.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
build_image:Custom Win=openvino-2020.4.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 17, 2020

👍

@alalek alalek merged commit a199d7a into opencv:master Jul 17, 2020
@alalek alalek mentioned this pull request Jul 28, 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.

1 participant

@alalek