-
-
Notifications
You must be signed in to change notification settings - Fork 56.3k
5.x merge 4.x #27694
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
Open
asmorkalov
wants to merge
26
commits into
opencv:5.x
Choose a base branch
from
asmorkalov:5.x-merge-4.x
base: 5.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
5.x merge 4.x #27694
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Capture is opened correctly.
…a_13_path [python][cuda] Update CUDA shared library location for CUDA Toolkit 13.0 on Windows
Skip test_cuda_convertTo
…frames Skip couple of intro frames in interactive calibration tool, if VideoCapture is opened correctly
Skip test_cuda_copyTo
Subdiv2d rect2f clean opencv#27641 Closes opencv#27623 Changes: - Added Subdiv2D(Rect2f) constructor overload - Added initDelaunay(Rect2f) method overload - No changes to the previous implementation to keep it backward compatible - Added tests for init and testing with edge case of extremely small coordinates - [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 See original pull request at : opencv#27631
Expose Orbbec color camera distortion coefficients as API.
add DEBUG_POSTFIX to ipphal
…ic_fix Fixed logical error in camera calibration tutorial.
libtiff upgrade to version 4.7.0 opencv#27679 ### 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 - [ ] 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
Fixed -Wunnecessary-virtual-specifier warning produced latest clang.
Refactor Blackwell opencv#27537 In CUDA 13: - 10.0 is b100/b200 same for aarch64 (gb200) - 10.3 is GB300 - 11.0 is Thor with new OpenRm driver (moves to SBSA) - 12.0 is RTX/RTX PRO - 12.1 is Spark GB10 Thor was moved from 10.1 to 11.0 and Spark is 12.1. Related patch: pytorch/pytorch#156176
### Pull Request Readiness Checklist resolves opencv#16295 ``` docker run --gpus 0 -v ~/opencv:/opencv -v ~/opencv_contrib:/opencv_contrib -it nvidia/cuda:12.8.1-cudnn-devel-ubuntu22.04 apt-get update && apt-get install -y cmake python3-dev python3-pip python3-venv && python3 -m venv .venv && source .venv/bin/activate && pip install -U pip && pip install -U numpy && pip install torch --index-url https://download.pytorch.org/whl/cu128 && cmake \ -DWITH_OPENCL=OFF \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_DOCS=OFF \ -DWITH_CUDA=ON \ -DOPENCV_DNN_CUDA=ON \ -DOPENCV_EXTRA_MODULES_PATH=/opencv_contrib/modules \ -DBUILD_LIST=ts,cudev,python3 \ -S /opencv -B /opencv_build && cmake --build /opencv_build -j16 export PYTHONPATH=/opencv_build/lib/python3/:$PYTHONPATH ``` 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
Wrap cicles grid GridType as settings structure is useless without it.
Fixed duplicate declaration issue in Swift/ObjC bindings
…ng-vec4i Enable Java wrapper generation for Vec4i opencv#27567 Fixes an issue where Java wrapper generation skips methods using Vec4i. Related PR in opencv_contrib: opencv/opencv_contrib#3988 The root cause was the absence of Vec4i in gen_java.json, which led to important methods such as aruco.drawCharucoDiamond() and ximgproc.HoughPoint2Line() being omitted from the Java bindings. This PR includes the following changes: - Added Vec4i definition to gen_java.json - Updated gen_java.py to handle jintArray-based types properly - ~~Also adjusted jn_args and jni_var for Vec2d and Vec3d to ensure correct JNI behavior~~ The modified Java wrapper generator successfully builds and includes the expected methods using Vec4i. ### 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 - [ ] 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
39aa49a
to
71fc969
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contrib: opencv/opencv_contrib#3989
#27537 from johnnynunez:patch-2
#27567 from utibenkei:fix-java-wrapper-missing-vec4i
#27581 from dkurt:d.kuryaev/dlpack
#27641 from Ma-gi-cian:subdiv2d-rect2f-clean
#27659 from asmorkalov:as/interactive_empty_frames
#27663 from asmorkalov:as/orbsensor_distortion
#27668 from cudawarped:python_loader_fix_cuda_13_path
#27670 from dkurt:skip_py_cuda_test
#27675 from dkurt:4.x
#27679 from sturkmen72:libtiff-4.7.0
#27680 from Kumataro:fix27626
#27682 from asmorkalov:as/ios_bindings_fix
#27683 from asmorkalov:as/calib_tutorial_logic_fix
#27687 from asmorkalov:as/virtual_warn_fix
#27689 from asmorkalov:as/pyton_wrap_gridtype
Previous "Merge 4.x": #27665