5.x merge 4.x #26768
Merged
5.x merge 4.x #26768
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
Fix for issue 26264
objdetect: fix invalid vector access in QR de/encoder
applyColorMap approxPolyN arrowedLine blendLinear boxPoints clipLine convertMaps createHanningWindow divSpectrums drawMarker findContoursLinkRuns fitEllipseAMS fitEllipseDirect getFontScaleFromHeight getRectSubPix HuMoments intersectConvexConvex invertAffineTransform minEnclosingTriangle preCornerDetect rotatedRectangleIntersection sqrBoxFilter spatialGradient stackBlur
Added Fastcv HAL changes in the 3rdparty folder. Code Changes includes HAL code , Fastcv libs and Headers Change-Id: I2f0ddb1f57515c82ae86ba8c2a82965b1a9626ec Requires binaries from opencv/opencv_3rdparty#86. Related patch to opencv_contrib: opencv/opencv_contrib#3811 ### 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 - [ ] 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
doc: fixed issue with doxygen 1.12
Perf tests for cv::boxFilter(): 5x5 added
Fixed several cases of unaligned pointer cast
…_missing_include_dirs Missing include directories needed for wayland-util and xkbcommon opencv#26563 See: opencv#26561 ### 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 - [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
…-docs Improvement of macOS installation guide in documentation opencv#26564 ### 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
- observed on Ubuntu 24.04
…oio_test_filter_unstable_gstreamer videoio(test): filter unstable GStreamer tests
Fix python re warning
[GSoC] Add GIF decode and encode for imgcodecs opencv#25691 this is related to opencv#24855 we add gif support for `imread`, `imreadmulti`, `imwrite` and `imwritemulti` opencv_extra: opencv/opencv_extra#1203 ### 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 - [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. - [ ] The feature is well documented and sample code can be built with the project CMake
Fix typo: renamed 'search_widow_size' to 'search_window_size'
An upcoming change in Protobuf will change the return types of various methods like Descriptor::name() and Message::GetTypeName() from const std::string& or std::string to absl::string_view. This CL fixes users of those methods to work both before and after the change.
…dation Updated trackbar callback function and improved documentation opencv#26524 This Fixes opencv#26467 Description: This pull request improve the OpenCV documentation regarding the Trackbar functionality. The current documentation does not provide clear guidance on certain aspects, such as handling the value pointer deprecation and utilizing callback arguments in C. This update addresses those gaps and provides an updated example for better clarity. Changes: Updated Documentation: Clarified the usage of the value pointer and explained how to pass an initial value, since the value pointer is deprecated. Added more detailed explanations about callback arguments in C, ensuring that users understand how to access and use them in Trackbar callbacks. Added a note on how to properly handle initial value passing without relying on the deprecated value pointer. Updated Tutorial Example: Renamed and used callback function parameters to make them more understandable. Included a demonstration on how to utilize userdata in the callback function. Additional Notes: Removed reliance on the value pointer for updating trackbar values. Users are now encouraged to use other mechanisms as per the current implementation to avoid the runtime warning. ### 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 - [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. - [] The feature is well documented and sample code can be built with the project CMake
Support string_view in caffe_importer
doc: upgraded for compatibility with doxygen 1.12
…er-check Fix opencv#25812: Add error handling for invalid nu parameter in SVM NU_SVC opencv#26587 ### 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 - [x] There is a reference to the original bug report and related work [Issue opencv#25812](opencv#25812) - [ ] 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 bugs in GIF decoding opencv#26738 ### Pull Request Readiness Checklist this is related to opencv#25691 i solved two bugs here: 1. the decoding setting: according to [https://www.w3.org/Graphics/GIF/spec-gif89a.txt](https://www.w3.org/Graphics/GIF/spec-gif89a.txt) ``` DEFERRED CLEAR CODE IN LZW COMPRESSION There has been confusion about where clear codes can be found in the data stream. As the specification says, they may appear at anytime. There is not a requirement to send a clear code when the string table is full. It is the encoder's decision as to when the table should be cleared. When the table is full, the encoder can chose to use the table as is, making no changes to it until the encoder chooses to clear it. The encoder during this time sends out codes that are of the maximum Code Size. As we can see from the above, when the decoder's table is full, it must not change the table until a clear code is received. The Code Size is that of the maximum Code Size. Processing other than this is done normally. Because of a large base of decoders that do not handle the decompression in this manner, we ask developers of GIF encoding software to NOT implement this feature until at least January 1991 and later if they see that their particular market is not ready for it. This will give developers of GIF decoding software time to implement this feature and to get it into the hands of their clients before the decoders start "breaking" on the new GIF's. It is not required that encoders change their software to take advantage of the deferred clear code, but it is for decoders. ``` at first i didn't consider this case, thus leads to a bug discussed in opencv#25691. the changes made in function lzwDecode() is aiming at solving this. 2. the fetch method of loopCount: in the codes at https://github.com/opencv/opencv/blob/4.x/modules/imgcodecs/src/grfmt_gif.cpp#L410, if the branch is taken, 3 more bytes will be taken, leading to unpredictable behavior. 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 - [ ] 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
Bug fix for opencv#25546 - Updating inliers for homography estimation opencv#26742 Fixes opencv#25546 ### 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 - [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. - [x] The feature is well documented and sample code can be built with the project CMake
fix threshold for photo_calibratedebevec regression test
Fix rotated aruco marker board generation opencv#26753 ### Issue : [25884](opencv#25884) ### 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 - [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 opencv#26086 - Update types inside HoughLinesProbabilistic
Remove useless C headers
3 tasks
894d032 to
cb74662
Compare
cb74662 to
a66cf21
Compare
Contributor
|
There are build failures related to |
Contributor
Author
|
Plugins build fixed. |
Contributor
|
#26856 is needed to fix the issue with RISC-V builder |
Contributor
Author
|
Yes, I'll repeat merge iteration with current 4.x when the current merge is ready. |
opencv-alalek
approved these changes
Feb 5, 2025
a66cf21 to
55a2ca5
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
35 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.
OpenCV Contrib: opencv/opencv_contrib#3871
OpenCV Extra: opencv/opencv_extra#1231
CI pipelines: opencv/ci-gha-workflow#219
#21407 from sensyn-robotics:feature/weighted_hough
#25500 from alex-urm:v4l_default_image_size
#25584 from dkurt:videocapture_from_buffer
#25608 from sturkmen72:animated_webp_support
#25691 from redhecker:gifSupport
#25715 from sturkmen72:apng_support
#26057 from asmorkalov:as/android_16k_pages
#26082 from mshabunin:fix-hal-cvt-functions
#26127 from alexlyulkov:al/blob-from-images
#26147 from vrabaud:opencv_js
#26164 from CSBVision:patch-7
#26379 from cdcseacave:jxl_codec
#26387 from sturkmen72:js-imgproc
#26472 from chacha21:gpumatnd_step
#26490 from vrabaud:4x_calibration_base
#26501 from asmorkalov:as/external_kleidicv
#26510 from Kumataro:fix26509
#26511 from sturkmen72:proposed_fix_for_21902
#26512 from sturkmen72:fix_build_js_warnings
#26513 from sturkmen72:fix_for_26264
#26516 from asmorkalov:as/pano_component_wrap
#26524 from MurtazaSaherwala:DocumentationUpdation
#26529 from asmorkalov:as/include_chrono
#26530 from mshabunin:fix-usac-vector-access
#26532 from mshabunin:fix-qr-bitstream
#26533 from mshabunin:fix-reduce-test
#26537 from artoolkitx:emscripten-build-fixes
#26544 from savuor:rv/perf_rotate_8uc2
#26547 from mshabunin:fix-type-cast
#26556 from asmorkalov:FastcvHAL_1stPost
#26557 from mshabunin/fix-doc-1.12
#26560 from savuor:rv/perf_box_5x5
#26563 from kallaballa:wayland_and_xkbcommon_missing_include_dirs
#26564 from shyama7004:improve-macos-install-docs
#26579 from FantasqueX:fix-re-warning-1
#26580 from opencv-pushbot:gitee/alalek/videoio_test_filter_unstable_gstreamer
#26587 from anandkaranubc:fix-nu-svc-parameter-check
#26590 from Kumataro:fix26589
#26591 from shyama7004:fix-typos
#26596 from y-guyon:4.x_absl_str
#26598 from mshabunin:fix-doc-footer
#26602 from shyama7004:minor-fix
#26604 from mshabunin:add-avx2-build
#26614 from KangJialiang:fix-multi-channel-mean-scale-sample-dnn-yolo
#26617 from CodeLinaro:xuezha_2ndPost
#26618 from KangJialiang:fix/yoloPostProcessing-variable-nc
#26619 from CodeLinaro:adsha_2ndPost
#26621 from CodeLinaro:apreetam_2ndPost
#26623 from asmorkalov:as/kelidicv_0.3
#26624 from hanliutong:rvv-mean
#26625 from NekoAsakura:4.x
#26627 from warped-rudi:torch
#26632 from fengyuentau:dnn/gelu_cann
#26633 from asmorkalov:as/optional_python_types
#26634 from FantasqueX:fix-test-exif-1
#26635 from FantasqueX:remove-no-long-long-1
#26636 from FantasqueX:fix-re-warning-2
#26637 from MaximSmolskiy:fix-VideoCapture-fails-to-read-single-image-with-digits-in-name
#26638 from vrabaud:opencv_js1
#26639 from vrabaud:opencv_js2
#26640 from vrabaud:opencv_js3
#26643 from vrabaud:js_clone_fix
#26644 from vrabaud:opencv_js2
#26645 from FantasqueX:fix-typo-3
#26650 from FantasqueX:fix-26642
#26652 from mshabunin:fix-ffmpeg-plugin
#26656 from warped-rudi:mediandk
#26663 from mshabunin:cleanup-dnn-ie-test
#26664 from asmorkalov:update_version_4.11.0-pre
#26666 from mshabunin:fix-rvv-tests
#26668 from WangWeiLin-MV:gstreamer/add-include-chrono
#26671 from asmorkalov:as/fastcv_cmake_fix
#26672 from opencv-pushbot:gitee/alalek/update_ffmpeg_4.x
#26675 from hanliutong:rvv-hal-fix
#26688 from sturkmen72:gif-png-webp-avif
#26690 from MaximSmolskiy:speed-up-and-reduce-memory-consumption-for-findContours
#26691 from asmorkalov:as/unstable_vkcom
#26695 from albertoZurini:py_pose_coordinates
#26698 from warped-rudi:mediandk2
#26699 from vrabaud:bmp_overflow
#26700 from vrabaud:png_buffer_overflow
#26701 from vrabaud:png_leak
#26704 from vrabaud:imgcodecs_flaky
#26706 from Kumataro:fix26705
#26710 from Kumataro:fix26709
#26713 from homuler:fix/build-ios-framework
#26714 from sturkmen72:png
#26715 from asmorkalov:as/png_leak
#26716 from MaximSmolskiy:fix-tests-for-ellipse-fitting
#26719 from MaximSmolskiy:remove-code-duplication-from-tests-for-ellipse-fitting
#26720 from vrabaud:png_leak
#26721 from MaximSmolskiy:fix-comment-for-fitEllipse-Java-case-accurracy-test
#26726 from vrabaud:png_comment
#26728 from vrabaud:png_behavior
#26729 from MaximSmolskiy:change-article-for-fitEllipseDirect-function
#26734 from asmorkalov:as/png_corrupted
#26737 from shyama7004:minor-change
#26738 from redhecker:fix
#26739 from vrabaud:png_leak
#26741 from shyama7004:minor-update
#26742 from ivashmak:fix_homography_inliers
#26744 from Diego1V:fixHoughSIGSEGV
#26748 from vrabaud:png_leak
#26750 from mshabunin:fix-ppc64-vsx
#26753 from shyama7004:RotatedMarkers
#26757 from shyama7004:test-fix
#26763 from vrabaud:remove_c
Previous "Merge 4.x": #26546