Skip to content

(5.x) Merge 4.x #3538

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 23 commits into from
Aug 1, 2023
Merged

(5.x) Merge 4.x #3538

merged 23 commits into from
Aug 1, 2023

Conversation

asmorkalov
Copy link
Contributor

@asmorkalov asmorkalov commented Jul 27, 2023

Main: opencv/opencv#24070
Extra: opencv/opencv_extra#1079

#3475 from cudawarped:cuda_fix_unaligned_hist
#3477 from cudawarped:cudacodec_add_luma_hist
#3488 from cudawarped:fix_cudacodec_codec_resolution
#3513 from cudawarped:fix_cudacodec_cudart_defines
#3514 from asmorkalov:as/ffmpeg_update_4.x
#3515 from asmorkalov:as/find_ellipses_memory
#3522 from asmorkalov:as/gcc_11_warning_fix
#3524 from asmorkalov:as/ci-ubuntu-2204
#3533 from asmorkalov:as/dnn_superres_java
#3534 from VadimLevin:dev/vlevin/remove-using-namespace-public-cudacodec-header
#3535 from asmorkalov:as/cuda_pytest_stabilization

Previous "Merge 4.x": #3527

cudawarped and others added 22 commits June 16, 2023 15:40
…solution

`cudacodec::VideoReader` FORCC update with main #23540
…efines

`cudacodec::VideoReader` - fix CUDART_VERSION tests
FFmpeg/4.x: update FFmpeg wrapper 2023.6
Modified histogram kernels to work with non aligned data
Fixed memory leak in EllipseDetector and Mat addressing
Wstringop-overflow warning fix in bio inspired module
`cudacodec::VideoReader` return luma hist from `nextFrame` if requested
…zation

Fixed several test failures in Python tests for CUDA modules
…g-namespace-public-cudacodec-header

fix: remove using namespace cuda from public header
Added Java bindings for dnn_superres module
@asmorkalov asmorkalov merged commit a9d5b85 into opencv:5.x Aug 1, 2023
@asmorkalov asmorkalov mentioned this pull request Sep 11, 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.

3 participants