Skip to content

(4.x) Merge 3.4#22911

Merged
alalek merged 22 commits intoopencv:4.xfrom
alalek:merge-3.4
Dec 3, 2022
Merged

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

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 3, 2022

#22771 from kallaballa:opencl_hls_and_hsv_conversions_bug
#22796 from ClayXrex:patch-1
#22805 from dan-masek:fix_issue_22766
#22806 from dan-masek:fix_issue_22767
#22830 from alalek:issue_22752
#22838 from dan-masek:fix_issue_22837
#22839 from zchrissirhcz:fix-typo-3.4
#22842 from asmorkalov:as/pr_22737_backport
#22865 from cpoerschke:3.4-issue-22860
#22888 from alalek:dnn_ov_fix_custom_layers
#22910 from alalek:cmake_pkg_config_ignore_atomic

Previous "Merge 3.4": #22818

build_image:Docs=docs-js:18.04
Xbuild_image:Custom=javascript
Xbuildworker:Custom=linux-f1,linux-1

buildworker:Linux OpenCL=linux-4
build_image:Linux OpenCL=ubuntu:20.04

Xbuild_image:Custom=ubuntu-openvino-2021.4.2:20.04
build_image:Custom=ubuntu-openvino-2022.1.0:20.04
test_modules:Custom=dnn,python2,python3,java
buildworker:Custom=linux-4
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=ON
test_bigdata:Custom=1
test_filter:Custom=*

build_image:Custom Win=openvino-2021.4.2
Xbuild_image:Custom Win=openvino-2022.1.0
buildworker:Custom Win=windows-1

kallaballa and others added 22 commits November 11, 2022 09:23
…nversions_bug

define the number of dstChannels for HLS and HSV conversion as well
…he toolbar window, which is always visible. (rebased to 3.x)
backport opencv#22737: Cocoa/highgui: Set [NSApp activateIgnoringOtherApps] to spawn window on top
imgcodecs: ensure parameters are key-value pairs, fix HDR encoder
Fix issue 22837: No more blank buttons on toolbar after resizing the window
fix: typo in opencv-python tutorials
ocl_minMaxIdx to call minmaxloc.cl for OpenCL 1.2+ only
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 3, 2022

👍

@alalek alalek merged commit b16f76e into opencv:4.x Dec 3, 2022
@alalek alalek mentioned this pull request Dec 18, 2022
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.

8 participants