Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(4.x) Merge 3.4 #23667

Merged
merged 14 commits into from May 24, 2023
Merged

(4.x) Merge 3.4 #23667

merged 14 commits into from May 24, 2023

Conversation

asmorkalov
Copy link
Contributor

@asmorkalov asmorkalov commented May 24, 2023

#23535 from komakai:fix_ocl_device_isintel
#23565 from MaximSmolskiy:fix-function-name-in-comment
#23612 from cpoerschke:3.4-issue-21532
#23629 from asmorkalov:as/cpu_features_bindings
#23631 from asmorkalov:as/eigen_NOMINMAX_warning_fix
#23632 from asmorkalov:as/AffineFeature_mask_fix_3.4
#23657 from asmorkalov:as/uyvy_cvtColor_size_check

Previous "Merge 3.4": #23523

build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-1,linux-4,linux-f1

komakai and others added 14 commits April 24, 2023 22:01
Restored Java bindings for CPU features management
…_fix_3.4

Fixed mask handling in AffineFeature
…ning_fix

Build warning fix on Windows for Eigen wrapper.
QRCodeDetector: don't floodFill with outside-of-image seedPoint opencv#23612

Fixes opencv#21532.

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [X] I agree to contribute to the project under Apache 2 License.
- [X] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [X] The PR is proposed to the proper branch
- [X] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
…_check

Added check that YUYV input of cvtColor has even width.
Copy link
Contributor

@opencv-alalek opencv-alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done 👍

@asmorkalov asmorkalov merged commit d4861bf into opencv:4.x May 24, 2023
21 checks passed
@asmorkalov asmorkalov mentioned this pull request Jun 19, 2023
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.

None yet

5 participants