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

5.x merge 4.x #3819

Merged
merged 4 commits into from
Nov 5, 2024
Merged

5.x merge 4.x #3819

merged 4 commits into from
Nov 5, 2024

Commits on Oct 29, 2024

  1. Configuration menu
    Copy the full SHA
    06ddcce View commit details
    Browse the repository at this point in the history
  2. Merge pull request opencv#3800 from vrabaud:cuda

    Get CUDA code to compile with clang CUDA and without CUDA opencv#3800
    
    Changelist:
    - there are some syntactic changes: `<< <` -> `<<<`. For some reason, I do not need to change all those in the code.
    -  `::min` -> `std::min` in `__host__` code
    - `modules/cudaimgproc/src/moments.cpp` needs to have the CUDA code in the `#ifdef`
    - The signature of `cv::cuda::swapChannels` is not exactly the same as the C++ one in `modules/cudaimgproc/src/color.cpp` 
    - `cv::cuda::FarnebackOpticalFlow::create` needs to be explicit about which FarnebackOpticalFlow it returns
    
    ### 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
    vrabaud authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    843b6ed View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge pull request opencv#3815 from cudawarped:cuda_fix_python_binary…

    …op_with_scalar
    
    `cudaarithm`: fix python bindings for binary ops involving scalars
    asmorkalov authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    5741f22 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. Merge branch 4.x

    asmorkalov committed Nov 2, 2024
    Configuration menu
    Copy the full SHA
    bd3b734 View commit details
    Browse the repository at this point in the history