Skip to content

Merge 3.4#15949

Merged
alalek merged 17 commits intoopencv:masterfrom
alalek:merge-3.4
Nov 19, 2019
Merged

Merge 3.4#15949
alalek merged 17 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 19, 2019

#15918 from alalek:python_debug_parameter
#15919 from alalek:python_fix_arginfo
#15925 from alalek:core_test_simd_cpp_emulation
#15937 from clunietp:3.4-fix-13577
#15938 from alalek:backport_15290
#15939 from alalek:ffmpeg_update_3.4
#15945 from alalek:dnn_ie_extension_handling
#15946 from alalek:fix_js_test_features2d

Previous "Merge 3.4": #15931

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#buildworker:Custom=linux-2
#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
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
build_image:Custom Mac=openvino-2019r3.0
build_image:Custom Win=openvino-2019r3.0
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 Nov 19, 2019

👍

@alalek alalek merged commit 318cba4 into opencv:master Nov 19, 2019
@alalek alalek mentioned this pull request Nov 22, 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.

3 participants