Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

5.x merge 4.x#27566

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asmorkalov merged 101 commits intoopencv:5.xfromasmorkalov:5.x-merge-4.x
Jul 24, 2025
Merged

5.x merge 4.x#27566

asmorkalov merged 101 commits intoopencv:5.xfromasmorkalov:5.x-merge-4.x
Jul 24, 2025

Conversation

@asmorkalov
Copy link
Contributor

@asmorkalovasmorkalov commentedJul 21, 2025
edited
Loading

OpenCV Contrib:opencv/opencv_contrib#3975
OpenCV Extra:opencv/opencv_extra#1268

Manual changes:

  • Turned off FFmpeg auto-rotation test on Windows as it requires FFmpeg rebuilt.
  • Disabled IPP HAL for warpAffine and warpPerspective as behavior changed in 5.x.

#24426 from dkurt:qrcode_eci_encoding
#24756 from fengyuentau:more_cann_operators
#26299 from s-trinh:feat/getClosestEllipsePoints_2
#26354 from onuralpszr:fix/kotlin-internal-error
#26703 from MaximSmolskiy:fix-matchTemplate-with-mask-crash
#26824 from futurewasfree:fix-chAruco
#26974 from klosteraner:Fix-IntersectConvexConvex
#27113 from sturkmen72:spng-CV_16U
#27127 from sturkmen72:apng_has_hidden_frame
#27149 from liane-lin:4.x
#27153 from 03kiko:fix-videowriter-writing-colorless-images-26276
#27324 from eplankin:warp_hal_4x
#27354 from eplankin:ipp_update22.1
#27355 from asmorkalov:as/gapi_control_msmf
#27362 from vrabaud:tsan
#27368 from fengyuentau:4x/imgproc/CreateHanningWindow-simd
#27375 from CodeLinaro:doc_update
#27379 from cudawarped:fix_cuda_convertTo
#27384 from Kumataro:fix27382
#27385 from CodeLinaro:doc_update
#27389 from MaximSmolskiy:add_HoughCirclesWithAccumulator_binding
#27390 from MaximSmolskiy:update_HoughLinesWithAccumulator_binding
#27393 from asmorkalov:as/elseif_hdr_parser
#27396 from abhishek-gola:hdr_bug_fix
#27398 from asmorkalov:as/relax_remap_relative
#27403 from CodeLinaro:apreetam_6thPost
#27406 from asmorkalov:as/revert_android_ipp
#27408 from KAVYANSHTYAGI:Umat-vector-contructor
#27414 from amane-ame:remap_fix
#27416 from Kumataro:fix27413
#27418 from dkurt:fix_valgrind_warnings
#27419 from FleeOvernight:fixUpdCameraId
#27421 from dkurt:dkurt-patch-1
#27422 from KAVYANSHTYAGI:codex/find-and-fix-major-repo-issue
#27428 from phanirithvij:dnn-cmake-protobuf-generate
#27430 from CodeLinaro:dsp_markdown
#27432 from dkurt:d.kurtaev/ipp_distTransform
#27434 from leopardracer:4.x
#27437 from mlourakis:4.x
#27440 from kilavvy:4.x
#27441 from KAVYANSHTYAGI:codex/find-feature-to-add-for-library
#27444 from vtjl10:4.x
#27447 from asmorkalov:as/kleidicv_0.5
#27448 from maximevtush:4.x
#27450 from wuwuzhijing:fix-float-conversion-warning
#27454 from eplankin:norm
#27455 from leopardracer:4.x
#27457 from sturkmen72:WebP-bugfix
#27458 from xaos-cz:4.x
#27459 from asmorkalov:update_version_4.12.0-pre
#27461 from fengyuentau:4x/hal/riscv-rvv/imgproc/disable_integral
#27463 from asmorkalov:as/new_atomics
#27469 from sturkmen72:png-fixes
#27470 from asmorkalov:as/phaseCorrelate_docs
#27472 from asmorkalov:as/norm_table_asan
#27475 from s-trinh:update_calib3d_doc
#27476 from s-trinh:LSD_drawSegments_avoid_exception_empty_vec
#27477 from valgur:patch-1
#27478 from asmorkalov:as/old_python_operators_eval
#27480 from asmorkalov:as/haveImageReader_doc
#27481 from opencv-pushbot:gitee/alalek/update_ffmpeg_4.x
#27482 from mshabunin:normalize-doc
#27483 from valgur:patch-2
#27484 from xaos-cz:cygwin_filesystem_support
#27485 from xaos-cz:exr_multispectral
#27486 from asmorkalov:as/qrcode_encode_java_ub_fix
#27492 from krikera:4.x
#27499 from vpisarev:image_io_with_metadata
#27504 from asmorkalov:as/optional_gdal
#27506 from vrabaud:avif
#27509 from vrabaud:videoio
#27514 from Kumataro:fix27513
#27516 from ClaudioMartino:norm_KL_div
#27518 from ClaudioMartino:fix_hist_comp_doc
#27519 from ekharkov:dev/reamp
#27523 from inventshah:fix-set-then-get-pos
#27525 from CodeLinaro:apreetam_7thPost
#27529 from vrabaud:png
#27532 from eplankin:warp_fix
#27536 from Kumataro:fix27530
#27544 from inventshah:fix-detect-and-compute-py-type
#27545 from vrabaud:png
#27546 from asmorkalov:as/interactive_calib_backend

Previous "Merge 4.x":#27435

MaximSmolskiyand others added30 commitsJanuary 2, 2025 22:14
Signed-off-by: Onuralp SEZER <thunderbirdtr@gmail.com>
Fix Typos in Comments and Error Messages Across Multiple Filesopencv#27434 Description:  This pull request corrects several typographical errors in comments and error messages in the following files:- `samples/directx/d3d11_interop.cpp`: Fixed typo in the error message ("betweem" → "between").- `samples/dnn/yolo_detector.cpp`: Fixed typo in a comment ("elemets" → "elements").- `samples/winrt/ImageManipulations/MediaExtensions/OcvTransform.cpp`: Fixed typo in a comment ("peferred" → "preferred").These changes improve code readability and maintain consistency in documentation and error reporting. No functional code was modified.
Correct IPP distanceTransform results with single threadopencv#27432### Pull Request Readiness Checklistresolvesopencv#24082See details athttps://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
Update IPP integrationopencv#27354Please merge together withopencv/opencv_3rdparty#96Supported IPP version was updated to IPP 2022.1.0 for Linux and Windows. Bugs in norm() function which caused failure of sanity check in performance tests were fixed, IPP calls were enabled.Previous update:opencv#26463
Closeopencv#27413### Pull Request Readiness ChecklistSee details athttps://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- [ ] 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
Fix Typo in CMakeLists.txt Comment
Fix Typos and Improve Clarity in Documentationopencv#27444Description:  This pull request addresses minor typographical errors and improves the clarity of documentation in several markdown files. Specifically:- Corrected spelling mistakes such as "traslation" to "translation".- Improved phrasing for better readability and understanding.- Added references to specific setter methods in the StereoBM documentation for more detailed guidance.These changes are limited to documentation and do not affect any code functionality.
Fix Typo in Function Docstring: "Forword" → "Forward" in person_reid.py
…-warningFix float-conversion warnings in FLANN by using float literals
Fixed bugs in orthogonalization; simplified column vectors copyingopencv#27437This PR mirrors to OpenCV a bug fix addressed by commit [a03d34b](terzakig/sqpnp@a03d34b) in SQPnPIt also fixes bugs in the orthogonalization introduced during the porting to OpenCV  and simplifies column vectors copying, eliminating double loops.### Pull Request Readiness ChecklistSee details athttps://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.- [x] The feature is well documented and sample code can be built with the project CMake
Fix Typos in Comments and Documentationopencv#27455Description:This pull request corrects minor typos in comments and documentation within the codebase:- Replaces "representitive" with "representative" in kmeans.cpp.- Replaces "indices" with the correct spelling in a comment in main.cu.
Added define disabling ippiNorm_Inf_16u_C1MRopencv#27454Workaround foropencv#27380. Fix will be available in the next ICV package update based on IPP 2022.2.0.
Consider QRCode ECI encodingopencv#24426### Pull Request Readiness Checklistrelated:opencv#24350 (review)1. Add `getEncoding` method to obtain ECI number2. Add `detectAndDecodeBytes`, `decodeBytes`, `decodeBytesMulti`, `detectAndDecodeBytesMulti` methods in Python (return `bytes`) and Java (return `byte[]`)3. Allow Python bytes to std::string conversion in general and add `encode(byte[] encoded_info, Mat qrcode)` in Java    Python example with Kanji encoding:    ```python    img = cv.imread("test.png")    detect = cv.QRCodeDetector()    data, points, straight_qrcode = detect.detectAndDecodeBytes(img)    print(data)    print(detect.getEncoding(), cv.QRCodeEncoder_ECI_SHIFT_JIS)    print(data.decode("shift-jis"))    ```    ```    b'\x82\xb1\x82\xf1\x82\xc9\x82\xbf\x82\xcd\x90\xa2\x8aE'    20 20    こんにちは世界    ```    source:https://github.com/opencv/opencv/blob/ba4d6c859d21536f84e0328c16f4cc3e96bf3065/modules/objdetect/test/test_qrcode_encode.cpp#L332    ![test](https://github.com/opencv/opencv/assets/25801568/0b5eefa8-918a-4c42-9acb-830f23c0ea9f)See details athttps://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
…with-mask-crashFix matchTemplate with mask crash
…erspectiveadd checkMarkers flag to charucoParameters to control board verification(post-detection)
fix for the issueopencv#27456opencv#27457closesopencv#27456### Pull Request Readiness ChecklistSee details athttps://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- [ ] 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
imread: GDAL multi-channel supportopencv#27458 - tested on 30-channel FITS and 186-channel ENVI files### Pull Request Readiness ChecklistSee details athttps://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
…proc/disable_integralhal/riscv-rvv: disable integral for now
…ningWindow-simdimgproc: vectorize cv::createHanningWindowopencv#27368### Pull Request Readiness ChecklistSee details athttps://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
asmorkalovand others added14 commitsJuly 14, 2025 08:54
Fixed memory leak in ipp_warp function
Fix potential crashes found by fuzzer.
Fix XMP write and discarded return value.
FIX: CvCapture_FFMPEG::setProperty(CAP_PROP_POS_*) followed by getPropertyopencv#27523Partiallyfixesopencv#23088 andopencv#23472. This PR fixes `get(CAP_PROP_POS_MSEC)` calls after a `set(CAP_PROP_POS_*)` without calling `read` first.Since `seek` calls `grabFrame` which already sets `picture_pts`, manually setting `picture_pts` anywhere else in the call stack should not be necessary (except for the special case of seeking to frame 0).Minimal example fromopencv#23088```cppfor(int i = 0; i < 3; i++) cap.read(img);printf("at: %f frames, %f msec\n", cap.get(CAP_PROP_POS_FRAMES), cap.get(CAP_PROP_POS_MSEC));cap.set(CAP_PROP_POS_FRAMES, 3);printf("at: %f frames, %f msec\n", cap.get(CAP_PROP_POS_FRAMES), cap.get(CAP_PROP_POS_MSEC));```Current```txtat: 3.000000 frames, 80.000000 msecat: 3.000000 frames, 0.234375 msec```PR```txtat: 3.000000 frames, 80.000000 msecat: 3.000000 frames, 80.000000 msec```It similarly helps with `CAP_PROP_POS_MSEC`:Current```txtat: 3.000000 frames, 80.000000 msecat: 2.000000 frames, 6.250000 msec```PR```txtat: 3.000000 frames, 80.000000 msecat: 2.000000 frames, 40.000000 msec```Note the seek operation is still inconsistent between the `CAP_PROP_POS_*` options as mentioned byopencv#23088, and VFR video seeking has issues discussed inopencv#9053. For fixed-frame rate video, we could change 0.5 to 1 in `void CvCapture_FFMPEG::seek(double sec);` to align `CAP_PROP_POS_MSEC` with `CAP_PROP_POS_FRAMES`, but `CAP_POS_AVI_RATIO` and VFR video would still be broken.### Pull Request Readiness ChecklistSee details athttps://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
imgcodecs: OpenEXR multispectral read/write supportopencv#27485OpenCV Extra:opencv/opencv_extra#1262Adds capability to read and write multispectral (>4 channels) images in OpenEXR format.### Pull Request Readiness ChecklistSee details athttps://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- [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.- [ ] The feature is well documented and sample code can be built with the project CMake
eigen: fix to get version from eigen after v3.4.0opencv#27536Closeopencv#27530### Pull Request Readiness ChecklistSee details athttps://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- [ ] 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
Replace deprecated proto2::FieldDescriptor::is_optional
…e-py-typefix: mark Feature2D.detectAndCompute mask as optional in Python type stubs
Update FastCV lib hash for Linux and AndroidUpdated libs PR [opencv/opencv_3rdparty#101](opencv/opencv_3rdparty#101)### Pull Request Readiness ChecklistSee details athttps://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- [ ] 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
…backendAdded command line option to select VideoCapture backend
@asmorkalovasmorkalov requested review fromfengyuentau andmshabunin and removed request forfengyuentauJuly 22, 2025 13:08
@asmorkalov
Copy link
ContributorAuthor

@mshabunin@fengyuentau Could you take a look?

@asmorkalov
Copy link
ContributorAuthor

@opencv-alalek do you have any suggestions?

@asmorkalovasmorkalov merged commitbd67770 intoopencv:5.xJul 24, 2025
48 of 51 checks passed
@asmorkalovasmorkalov mentioned this pull requestJul 28, 2025
@opencv-alalekopencv-alalek removed their request for reviewJuly 30, 2025 18:25
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@fengyuentaufengyuentaufengyuentau approved these changes

@mshabuninmshabuninAwaiting requested review from mshabunin

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

20 participants

@asmorkalov@fengyuentau@MaximSmolskiy@onuralpszr@KAVYANSHTYAGI@leopardracer@dkurt@eplankin@Kumataro@kilavvy@vtjl10@maximevtush@wuwuzhijing@mlourakis@sturkmen72@xaos-cz@cudawarped@s-trinh@valgur@alalek

[8]ページ先頭

©2009-2025 Movatter.jp