Skip to content

(4.x) Merge 3.4#20928

Merged
alalek merged 19 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 23, 2021
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 23, 2021 •
edited
Loading

#20879 from Wehzie:patch-1
#20883 from rogday:eltwise_refactoring
#20894 from alalek:core_simd_int64_ctor_sse
#20895 from sergiud:avx-error-immediate
#20897 from ThalesGroup:master
#20900 from zchrissirhcz:3.4-hwfeatures-support-qnx
#20906 from alalek:backport_20903
#20912 from AleksandrPanov:fix_findMinEnclosingTriangle
#20916 from Harvey-Huang:32bit_rgb
#20919 from berak:patch-1

Previous "Merge 3.4": #20884

Details 
Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
Xbuildworker: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
Xbuild_image:Custom=powerpc64le
Xbuild_image:Custom=ubuntu-openvino-2019r3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2020.4.0:16.04
Xbuild_image:Custom=ubuntu-openvino-2021.1.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.2.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.0:20.04
Xbuild_image:Custom=ubuntu-openvino-2021.4.1:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=ubuntu-vulkan:16.04
Xbuildworker:Custom=linux-4
Xbuild_image:Custom=fedora:28
Xbuild_image:Custom=ubuntu-cuda:16.04
Xbuild_image:Custom=ubuntu-clang:18.04
Xbuild_image:Custom=ubuntu:20.04
Xbuildworker:Custom=linux-1
Xbuild_image:Custom=javascript-simd
Xbuild_image:Custom=mips64el

Xbuild_image:Custom Mac=openvino-2019r3.0
Xbuild_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
Xbuild_image:Custom Mac=openvino-2021.3.0
Xbuild_image:Custom Mac=openvino-2021.4.0
build_image:Custom Mac=openvino-2021.4.1
test_modules:Custom Mac=dnn,gapi,python2,python3,java

Xbuild_image:Custom Win=openvino-2019r3.0
Xbuild_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
Xbuild_image:Custom Win=openvino-2021.3.0
Xbuild_image:Custom Win=openvino-2021.4.0
build_image:Custom Win=openvino-2021.4.1
buildworker:Custom Win=windows-3
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules:Custom Win=dnn,gapi,python2,python3,java
test_opencl:Custom Win=ON
build_contrib:Custom Win=OFF
Xbuild_image:Custom Win=msvs2017
Xbuild_image:Custom Win=msvs2019

Wehzie and others added 19 commits October 17, 2021 15:37
@Wehzie @alalek
Fixed typo in CV_Error message
f9e747d 
Error was "Input parameters must be a matrices!", but "matrices" is plural and doesn't allow the unspecific article "a".
@alalek
Merge pull request opencv#20879 from Wehzie:patch-1
e6c68ee
@sergiud
fixed AVX compile error
f8f9f3c 
Some older compilers do not allow to pass a `const int` as an immediate. Use an unnamed enum instead.
@alalek
core(SIMD): update int64 SSE constructor
b5fcb06
@alalek
Merge pull request opencv#20895 from sergiud:avx-error-immediate
c316dbe
Allow to set av_log_set_level to reduce ffmpeg level below AV_LOG_ERROR
9a9e457
@alalek
Merge pull request opencv#20897 from ThalesGroup:master
3f191e1
@rogday
Merge pull request opencv#20883 from rogday:eltwise_refactoring
b3f966e 
* backport elementwise_layers refactor

* keep NULL
@alalek
Merge pull request opencv#20894 from alalek:core_simd_int64_ctor_sse
b1f422c
@zchrissirhcz
Merge pull request opencv#20900 from zchrissirhcz:3.4-hwfeatures-supp…
7da5178 
…ort-qnx

* fix: correctly check neon flags for QNX platform

* refactor: change __QNXNTO__ to __QNX__
@alalek
samples: fix build without threading support
f77fdc0
32bit rgb bmp file should not copy data as rgba
ce68291
@alalek
Merge pull request opencv#20916 from Harvey-Huang:32bit_rgb
4e65db8
@alalek
Merge pull request opencv#20906 from alalek:backport_20903
bc8eac2
fix findMinEnclosingTriangle and add tests
d21622b
@alalek
Merge pull request opencv#20912 from AleksandrPanov:fix_findMinEnclos…
12507aa 
…ingTriangle
@berak
resolves opencv#20913
a6f5717 
imgproc: remove asserts for circles_ in HoughCircles
@alalek
Merge pull request opencv#20919 from berak:patch-1
aa11cc1
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
6a2077c
This was referenced Oct 23, 2021
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 23, 2021

👍

@alalek alalek merged commit 6a2077c into opencv:master Oct 23, 2021
@alalek alalek mentioned this pull request Oct 30, 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.

6 participants

@alalek @Wehzie @sergiud @rogday @zchrissirhcz @berak