(5.x) Merge 4.x #3721
Merged
(5.x) Merge 4.x #3721
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
Update edge_drawing.cpp
…o_codec_sdk_12_2 cudacodec: fix opencv#3711 (update for Nvidia Video Codec SDK 12.2)
Move Charuco/Calib tutorials and samples to main repo
fix not merging when there are only two segs on one line
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Main OpenCV: opencv/opencv#25422
#3708 from AleksandrPanov:move_charuco_tutorial
#3714 from Kumataro:fix25073_format_g
#3717 from cudawarped:update_for_nvidia_video_codec_sdk_12_2
#3719 from Roger8:fix_merge_two_segs
#3720 from sturkmen72:fix_contrib_3704
Previous "Merge 4.x": #3716