Skip to content

5.x merge 4.x #3628

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

Merged
merged 12 commits into from
Jan 24, 2024
Merged

5.x merge 4.x #3628

merged 12 commits into from
Jan 24, 2024

Conversation

asmorkalov
Copy link
Contributor

Related PR in main repo: opencv/opencv#24912
Related PR in extra: opencv/opencv_extra#1144

#3613 from amishutin:signal_module
#3615 from cudawarped:cudacodec_enable_win32_for_updated_dll
#3616 from vrabaud:4.x
#3618 from cudawarped:cudaimgproc_moments_fix
#3620 from opencv-pushbot:gitee/alalek/signal_hotfix
#3624 from Kumataro:fix24890

Previous "Merge 4.x": #3621

cudawarped and others added 11 commits December 30, 2023 20:53
This is useful if highgui is built without the imgcodecs dependency.
cudaimgproc: update for CUDA 8.0 and fix out of bounds memory error in cuda::moments opencv#3618

Fix opencv#3612 and address out of bounds memory error when not calculating all image moments.

### 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
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
…_for_updated_dll

`cudacodec`: Enable features available with updated ffmpeg dll
@opencv-alalek
Copy link

into opencv:4.x

again.

@asmorkalov asmorkalov changed the base branch from 4.x to 5.x January 24, 2024 09:23
@asmorkalov asmorkalov merged commit d9275cb into opencv:5.x Jan 24, 2024
This was referenced Feb 5, 2024
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.

7 participants