Skip to content

Merge 3.4#18944

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

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Nov 27, 2020

#17077 from i386x:check-negative-values
#18845 from joegeisbauer:fix_reduce_mean_index_error
#18862 from sl-sergei:support_pool1d
#18882 from alalek:build_warning_calib3d_drop_register
#18887 from HollowMan6:patch-1
#18895 from oravital7:flip-module
#18896 from alalek:cmake_fix_eigen_detection
#18914 from alalek:videoio_fix_missing_get_capture_domain
#18918 from gabrielnhn:patch-2
#18922 from alalek:3.4-xcode12
#18939 from alalek:unstable_test_18937

Previous "Merge 3.4": #18881

Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
Xbuild_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

joegeisbauer and others added 21 commits November 20, 2020 11:17
Fix for index error for Reduce Mean

Correct Reduce Mean indexing error
Add checks that prevents indexing an array by negative values.
adatapted -> adapted
Support for Pool1d layer for OpenCV and OpenCL targets

* Initial version of Pool1d support

* Fix variable naming

* Fix 1d pooling for OpenCL

* Change support logic, remove unnecessary variable, split the tests

* Remove other depricated variables

* Fix warning. Check tests

* Change support check logic

* Change support check logic, 2
xrange was abandoned and doesn't exist in Python 3. range() works just the same
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Nov 27, 2020

👍

@alalek alalek merged commit 2155296 into opencv:master Nov 27, 2020
@alalek alalek mentioned this pull request Dec 4, 2020
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.

6 participants