Skip to content

(4.x) Merge 3.4#19835

Merged
alalek merged 13 commits intoopencv:masterfrom
alalek:merge-3.4
Apr 2, 2021
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Apr 1, 2021 •
edited
Loading

#19822 from alalek:core_wui_backward_compatibility (backport)
#19823 from alalek:issue_contrib_2895 (moved to contrib)
#19825 from alalek:cmake_fix_headers_order_python_3.4
#19827 from alalek:build_videoio_macosx_override_3.4 (backport)
#19830 from alalek:issue_19368
#19831 from alalek:backport_19771 (backport)

Previous "Merge 3.4": #19821

Details 
buildworker: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
#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
build_image:Custom Mac=openvino-2021.3.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
build_image:Custom Win=openvino-2021.3.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

lionkun and others added 13 commits March 27, 2021 21:52
@alalek
fix the perf tests of OpenCV.js so that it can run on Node.js success…
8d232a6 
…fully
@alalek
core: backward compatibility for vx_store/vx_store_aligned calls
b26f5b9
@alalek
cuda: fix inplace condition in cv::cuda::flip
e4b0251
@alalek
cmake: fix files order in Python bindings
1b3e0b2 
- with changes backport from 4.x
@alalek
videoio(build): eliminate inconsistent 'override' warnings
4ae2c11
@alalek
videoio(dshow): add NULL ptr check
d7cb2ea
@alalek
Merge pull request opencv#19822 from alalek:core_wui_backward_compati…
2907fb8 
…bility
@alalek
Merge pull request opencv#19825 from alalek:cmake_fix_headers_order_p…
7f66485 
…ython_3.4
@alalek
Merge pull request opencv#19827 from alalek:build_videoio_macosx_over…
6865787 
…ride_3.4
@alalek
Merge pull request opencv#19831 from alalek:backport_19771
5db484b
@alalek
Merge pull request opencv#19830 from alalek:issue_19368
0ff57e3
@alalek
Merge pull request opencv#19823 from alalek:issue_contrib_2895
6a72bf5
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12d80b9
@alalek alalek mentioned this pull request Apr 1, 2021
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Apr 2, 2021

👍

@alalek alalek merged commit 12d80b9 into opencv:master Apr 2, 2021
@alalek alalek mentioned this pull request Apr 8, 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.

1 participant

@alalek