Skip to content

Merge 3.4#15004

Merged
alalek merged 12 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 9, 2019
Merged

Merge 3.4#15004
alalek merged 12 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 9, 2019

#14811 from jxu:ubuntu-doc-fix
#14858 from dvd42:instancenorm_onnx
#14981 from alalek:android_camera_use_calc_frame_size_method
#14983 from tomoaki0705:fixOclCvtColorMRGBA
#14989 from alalek:issue_14978
#15001 from antmicro:v4l2-y10-support

Previous "Merge 3.4": #14980

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
docker_image:Docs=docs-js
docker_image:Custom=javascript
#docker_image:Custom=powerpc64le
#docker_image:Custom=ubuntu-openvino:16.04
#buildworker:Custom=linux-2
#docker_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#docker_image:Custom=fedora:28
#docker_image:Custom=ubuntu-cuda:16.04
build_image:Custom Mac=openvino-2019r1
build_image:Custom Win=openvino-2019r1
#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 9, 2019

👍

@alalek alalek merged commit f663e8f into opencv:master Jul 9, 2019
@alalek alalek mentioned this pull request Jul 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants