-
-
Notifications
You must be signed in to change notification settings - Fork 56.4k
(5.x) Merge 4.x #25840
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
Merged
Merged
(5.x) Merge 4.x #25840
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
Accuracy tests for equalizeHist() added opencv#25759 ### 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. - [x] The feature is well documented and sample code can be built with the project CMake
…vex_fix Fixed result buffer overflow in intersectConvexConvex_ for non-convex input
…annel Handle BGRA streams in GStreamer backend
…old_emsdk Use onRuntimeInitialized with OpenCV.js Node tests opencv#25757 ### Pull Request Readiness Checklist tests: opencv/ci-gha-workflow#174 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
Svgfig library update to version 1.0.1 as it uses BSD-3 license.
video: fix vittrack in the case where crop size grows until out-of-memory when the input is black opencv#25771 Fixes opencv#25760 ### 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. - [x] The feature is well documented and sample code can be built with the project CMake
Android SDK build script: HWAsan flags added for release mode opencv#25746 A quick fix for opencv#25718 ### 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. - [x] The feature is well documented and sample code can be built with the project CMake
Fixed input buffer read overflow in vectorized G-API convertTo implementation
Added LUT for FP16 and accuracy test
Extended bilateralFilter test to cover more branches
Add missing cv2eigen overload opencv#25751 Fixes opencv#16606 Add overloads to cv2eigen to handle eigen matrices of type Eigen::Matrix<Tp_, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> ### 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
…nnx-params-arbitrary-session-options Extending G-API onnx::Params to pass arbitrary session options opencv#25791 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [ ] I agree to contribute to the project under Apache 2 License. - [ ] 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
…space dnn: add DepthToSpace and SpaceToDepth opencv#25779 We are working on updating WeChat QRCode module. One of the new models is a fully convolutional model and hence it should be able to run with different input shapes. However, it has an operator `DepthToSpace`, which is parsed as a subgraph of `Reshape -> Permute -> Reshape` with a fixed shape getting during parsing. The subgraph itself is not a problem, but the true problem is the subgraph with a fixed input and output shape regardless input changes. This does not allow the model to run with different input shapes. Solution is to add a dedicated layer for DepthtoSpace and SpaceToDepth. Backend support: - [x] CPU - [x] CUDA - [x] OpenCL - [x] OpenVINO - [x] CANN - [x] TIMVX - ~Vulkan~ (missing fundamental tools, like permutation and reshape) ### 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. - [x] The feature is well documented and sample code can be built with the project CMake
cmake: support 10+ minor version(10,11,...)
Add yolov8l.onnx to samples opencv#25775 ### 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 Hello, I noticed that the /samples/dnn/models.yml said it should be used for all yolov8 models, but the YOLOv8l is not included in the file, so I added it to the file, thanks. 
Replace use of "eval()" with "getattr()".
Highgui backend on top of Framebuffer opencv#25661 ### 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 - [ 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 Environment variables used: OPENCV_UI_BACKEND - you need to add the value “FB” OPENCV_UI_PRIORITY_FB - requires priority indication OPENCV_HIGHGUI_FB_MODE={FB|XVFB|EMU} - mode of using Framebuffer (default "FB") - FB - Linux Framebuffer - XVFB - virtual Framebuffer - EMU - emulation (images are not displayed) OPENCV_HIGHGUI_FB_DEVICE (FRAMEBUFFER) - path to the Framebuffer file (default "/dev/fb0"). Examples of using: sudo OPENCV_UI_BACKEND=FB ./opencv_test_highgui sudo OPENCV_UI_PRIORITY_FB=1111 ./opencv_test_highgui OPENCV_UI_BACKEND=FB OPENCV_HIGHGUI_FB_MODE=EMU ./opencv_test_highgui sudo OPENCV_UI_BACKEND=FB OPENCV_HIGHGUI_FB_MODE=FB ./opencv_test_highgui export DISPLAY=:99 Xvfb $DISPLAY -screen 0 1024x768x24 -fbdir /tmp/ -f /tmp/user.xvfb.auth& sudo -u sipeed XAUTHORITY=/tmp/user.xvfb.auth x11vnc -display $DISPLAY -listen localhost& DISPLAY=:0 gvncviewer localhost& FRAMEBUFFER=/tmp/Xvfb_screen0 OPENCV_UI_BACKEND=FB OPENCV_HIGHGUI_FB_MODE=XVFB ./opencv_test_highgui
Remove unused variables in rgb2hsv_b simd
Fill mean and stdDev tails with zeros for HAL branch in meanStdDev opencv#25789 as it's done for other branches. ### 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
Remove unused brow variable
Fixed build error hal_rvv_071 opencv#25793 Fixed bug with enabling vector header when vector extension is disabled (RVV=OFF) in hal_rvv_071
…els_deps Drop redundant dependency from download_models.py
…rm_header Exclude cap_ios.h from installation where it's not needed
…alizeHist Relax equalizeHist test for some HAL implementations
…WND_NOTOPMOST, not HWND_TOP.
Added a definition for M_PI in the code to resolve a compilation error encountered when building OpenCV on the MSYS2 environment. The M_PI constant was not defined, causing the compilation to fail.
…ements Force contributors to define Apache 2.0 license for the new PRs.
Fix file descriptor leak in HDR decoder
Fix opencv#25833: The correct way to disable top-most state is with HWND_NOTOPMOST, not HWND_TOP.
Fix: compilation Issue on ARM64 (msys2 clangarm)
Update the tutorial of using Orbbec Astra cameras opencv#25813 This PR is the backport of Orbbec OpenNI-based Astra camera related changes from opencv#25410 to the 4.x branch, which includes updating the tutorial of Orbbec Astra cameras, renaming `orbbec_astra.cpp`. ### 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. - [x] The feature is well documented and sample code can be built with the project CMake
This was referenced Jul 1, 2024
opencv-alalek
approved these changes
Jul 1, 2024
Contributor
opencv-alalek
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved with notes:
- there is broken DNN-OpenCL
- there is broken compilation for Linux 32-bit
- there is failed tests in JS code
All there are from original 5.x branch.
Merged
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.
OpenCV Contrib: opencv/opencv_contrib#3763
OpenCV Extra: opencv/opencv_extra#1187
#25602 from asmorkalov:as/gstreamer_alpha_channel
#25661 from itlab-vision:framebuffer
#25725 from asmorkalov:as/intersectConvexConvex_fix
#25746 from savuor:rv/hwasan_flag_release
#25751 from simonkampe:fix-eigen-rowmajor
#25757 from dkurt:d.kurtaev/opencv_js_tests_old_emsdk
#25759 from savuor:rv/equalizeHist_tests
#25771 from fengyuentau:vittrack_black_input
#25773 from eplankin:eplankin/fix_layout
#25775 from richard28039:4.x
#25778 from asmorkalov:as/svgfig_update
#25779 from fengyuentau:dnn/fix_onnx_depthtospace
#25780 from asmorkalov:as/gapi_arm_overflow
#25787 from asmorkalov:as/lut_fp16
#25788 from asmorkalov:as/bilateralFilter_test
#25789 from asmorkalov:as/HAL_meanStdDev_tails
#25791 from ujjayant-kadian:uk/extend-gapi-onnx-params-arbitrary-session-options
#25793 from MaximMilashchenko:hal_rvv
#25803 from Kumataro/fix25802
#25805 from TFiFiE:patch-1
#25813 from kaingwade:orbbec-astra
#25815 from FantasqueX:remove-unused-variable-1
#25816 from FantasqueX:remove-unused-brow-1
#25820 from asmorkalov:as/HAL_non_strict_equalizeHist
#25826 from asmorkalov:as/clean_download_models_deps
#25827 from asmorkalov:as/exclude_ios_platform_header
#25829 from asmorkalov:as/force_legal_requirements
#25834 from thiru31:4.x
#25836 from dan-masek:fix_win32_topmost_toggle
#25838 from tyler92:fix-fd-leak
Previous "Merge 4.x": #25745