Skip to content

(4.x) Merge 3.4#21238

Merged
alalek merged 15 commits intoopencv:4.xfrom
alalek:merge-3.4
Dec 11, 2021
Merged

(4.x) Merge 3.4#21238
alalek merged 15 commits intoopencv:4.xfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 11, 2021 •
edited
Loading

#21074 from vrabaud:3.4_rect
#21188 from UncleLLD:fix-markdown-error
#21193 from alalek:imgproc_test_bitexact_cvtcolor_yuv
#21213 from alalek:issue_20850_case1
#21219 from asenyaev:asen/remove_distutils
#21224 from UncleLLD:fix-cvtColor-error
#21228 from alalek:issue_21198
#21235 from jonay2000:fix-docs

Previous "Merge 3.4": #21186

Details 
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

alalek and others added 15 commits December 4, 2021 04:36
@alalek
imgproc(test): add bit-exact tests for YUV cvtColor conversions
0c0b1ec
@alalek
carotene: disable YUV color conversions (bit-exact issue)
a3287b8
@UncleLLD
Merge pull request opencv#21188 from UncleLLD:fix-markdown-error
5aef565 
fix issue 21187: markdown file: gray image does not have three dimensions
@alalek
cmake: fix OPENGL_LIBRARIES handling
65392d5
@alalek
Merge pull request opencv#21213 from alalek:issue_20850_case1
16b674b
@asenyaev
Merge pull request opencv#21219 from asenyaev:asen/remove_distutils
d6891c7 
* Replaced distutils module to sysconfig

* Fixed getting a path to python lib
@vrabaud
Solve Rect overflow issues.
6b4ea68 
Fow now, it is possible to define valid rectangle for which some
functions overflow (e.g. br(), ares() ...).
This patch fixes the intersection operator so that it works with
any rectangle.
@UncleLLD
Merge pull request opencv#21224 from UncleLLD:fix-cvtColor-error
62a010a 
fix cvtColor-error

* fix gray image channel error

* fix gray image channel error

* fix cvtColor error after the video end

* fix cvtColor error after the video end and change next variable

* fix cvtColor error after the video end

* reset next variable

* fix cvtColor error after the video end

* fix cvtColor error after the video end
@alalek
imgproc(ocl): fix resizeLN, avoid integer overflow
659cf72
@alalek
Merge pull request opencv#21074 from vrabaud:3.4_rect
9b7f40c
@alalek
Merge pull request opencv#21228 from alalek:issue_21198
c4ab0c0
@alalek
Merge pull request opencv#21193 from alalek:imgproc_test_bitexact_cvt…
04020f3 
…color_yuv
@jdonszelmann
Update name from Gunner to Gunnar as that's the name he published his
d1b923b 
paper under.
@alalek
Merge pull request opencv#21235 from jonay2000:fix-docs
5462710
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
d24befa
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 11, 2021

👍

@alalek alalek merged commit d24befa into opencv:4.x Dec 11, 2021
@alalek alalek mentioned this pull request Dec 15, 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.

5 participants

@alalek @UncleLLD @asenyaev @vrabaud @jdonszelmann