5.x merge 4.x #25460
Merged
5.x merge 4.x #25460
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
Fixed ONNX range layer opencv#25414 Partially address opencv#25363 Fixed ONNX range layer. It should support any input type. Added tests (extra [PR](opencv/opencv_extra#1170)) ### 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
Handle top and left border masked pixels correctly in inpaint method opencv#25402 Fixes opencv#25389 ### 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
New HAL API for remap
features2d: reduce accuracy test avg memory consumption opencv#25424 **Merge with contrib**: opencv/opencv_contrib#3722 I've observed high memory consumption in the `opencv_test_features2d` (x86_64, Ubuntu 22.04, Debug):  It's always more than 180 MiB with peak at 535 MiB This was caused by pointers to the algorithm object instances stored in the tests parameters. I've replaced them with factory functions/lambdas with the following result:  Now peak is at 355 MiB and permanent consumption level is ~ 1-2 MiB **Note:** current peak is caused by KAZE features allocating 8x image size utility buffers. Not sure if we can or should do anything about it: https://github.com/opencv/opencv/blob/66fb5021e9253e3decab376d00322eaf2b279c89/modules/features2d/src/kaze/KAZEFeatures.cpp#L61-L68
…it_exact Added HAL function for popular bit-exact branch of GaussianBlur with sigma=0
Fix race condition in InternalFFMpegRegister initialization. opencv#25419 initLogger_ does not check if the logger has been initizalized before and it might initialize it several times from different threads, racing with other threads that are logging. ### 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
Bump libwebp to v1.4.0
imgproc: sync boundingRect function with 5.x
apps: createsamples: fix comment to remove last backslash opencv#25445 Close opencv#25403 ### 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
Added FaceDetectorYN to OpenCV JS API
core: fix `Core_GEMM.accuracy` failure on recent macOS
Fix for IPP 2021.10 with OneAPI 2024 opencv#25317 fixes opencv#25270 ### 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
Remove unnecessary FIXIT section in grfmt_tiff.cpp opencv#25447 No int64/uint64 is used in the code anymore. grfmt_tiff.hpp includes the tiff.h header inside of the tiff_dummy_namespace declaration. One implication of this is that all namespaced declarations made in tiff.h become qualified with tiff_dummy_namespace::. Because tiff.h includes standard library headers, the std namespace declarations are converted to tiff_dummy_namespace::std declarations. Subsequently, grfmt_tiff.hpp declares using namespace tiff_dummy_namespace;. This can lead to an ambiguity error during the resolution of the std namespace. ### 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
Add cv::currentUIFramework opencv#25354 issue opencv#25329 ### 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 - [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
144c4b6 to
4a232b6
Compare
This was referenced Apr 19, 2024
4a232b6 to
f692701
Compare
f692701 to
43d243d
Compare
alexlyulkov
approved these changes
Apr 22, 2024
|
|
||
| // Issue: https://github.com/opencv/opencv/issues/25363 | ||
| // The issue was addressed in 4.x, but the solution does not fit 5.x design | ||
| TEST_P(Test_ONNX_layers, DISABLED_Range) |
Contributor
There was a problem hiding this comment.
I believe we should introduce policy to validate incoming DNN patches on both 4.x and 5.x branches to avoid cases like that.
Testing on both branches should improve proposed solutions.
opencv-alalek
approved these changes
Apr 22, 2024
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 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#3723
OpenCV Extra: opencv/opencv_extra#1172
#25317 from junxnone:ipp_202110
#25354 from LaurentBerger:uiname
#25397 from asmorkalov:as/HAL_GaussianBlur_bit_exact
#25399 from asmorkalov:as/HAL_remap
#25402 from Linaname:4.x
#25414 from alexlyulkov:al/range-fixed
#25419 from vrabaud:ffmpeg
#25424 from mshabunin:fix-features2d-test
#25430 from asmorkalov:as/FaceDetectorYN_js
#25432 from vrabaud:webp_1.4.0
#25439 from mshabunin:cpp-contours-5-back
#25445 from Kumataro:fix25403
#25447 from vrabaud:tiff
#25454 from fengyuentau:fix_core_gemm_acc
Previous "Merge 4.x": #25422