(5.x) Merge 4.x #26073
Merged
(5.x) Merge 4.x #26073
+1,245
−650
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
pyrDown: offset HAL added, IPP removed opencv#25970 Resolves opencv#25976 ### Changes * HAL added for offset support so that border pixels can be fetched from outside of the image ROI (see `BORDER_ISOLATED` parameter) * IPP removed since there is `pyrUp` instead of `pyrDown` and there's no easy way to fix this other than rewriting it from scratch * replaced old C call by modern `cv::pyrDown` ### 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
Fixed asserts in fillPoly
Add support for QNX opencv#25832 Build and test instruction for QNX: https://github.com/chachoi-world/qnx-ports/blob/main/opencv/README.md ### 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
…-26000 got rid of std prefix
Improved samples/python/tracker.py docstring opencv#25959 This PR removed unused arguments and updated existing argument placeholders to be more descriptive of what they are. ### 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
…python-tutorials Remove empty Additional Resources and Exercises fields from tutorials opencv#26002 ### 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 This PR is in response to issue [26001](opencv#26001) This pull request addresses the issue of empty "Additional Resources" and "Exercises" fields in several OpenCV-Python tutorials. The empty sections have been removed to improve the clarity and consistency of the documentation.
imgproc: add specific error code when cvtColor is used on an image with an invalid number of channels opencv#25981 close opencv#25971 ### 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
doc: remove duplicated OpenCV Theory at ToC in Basic Drawing opencv#26018 Close opencv#26017 ### 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
correct "enviroment" to "environment"
Fix typos opencv#26038 Fix typos ### 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
…her-py-markdown fixing issue 25962
Docfix - Remove notice on using deprecated itemset
Fix: reduce redundant code by optimizing device name retrieval
…et_votes speedup random forest getVotes method.
Free Variant variable after usage in DShow back-end
Imgproc: use double to determine whether the corners points are within src opencv#26022 close opencv#26016 Related opencv/opencv_contrib#3778 ### 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
…cation Einsum buffer allocation fix opencv#26059 This PR fixed buffer allocation issue in Einsum layer that causes segmentation fault on 32bit platforms. Related issue opencv#26008 ### 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 the simd bugs of iPow8u and iPow16u opencv#26061 Add the following cases in opencv_perf_core: * OCL_PowFixture_iPow.iPow/0, where GetParam() = (640x480, 8UC1) * OCL_PowFixture_iPow.iPow/2, where GetParam() = (640x480, 16UC1) iPow8u and iPow16u failed to call to simd accelerating while executing. Fix the bug by changing the input type of iPow_SIMD function. ### 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
…ert on Intel iGPU.
Enable `CV_SIMD_SCALABLE` for median blur.
Removed duplicated code in Pow implementation that triggers wrong assert on Intel iGPU
build/doc: disabled libdc1394 by default, documented framebuffer options
…e-tests DNN(ONNX): Enabled several OpenCL conformance tests opencv#26053 The tests also work in 5.x ### 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 Aug 27, 2024
b04a756 to
9d93106
Compare
asmorkalov
commented
Aug 28, 2024
| Mat output_res_val = outputs.front(), | ||
| output_res_ind = outputs.back(); | ||
|
|
||
| output_ref_ind.convertTo(output_ref_ind, CV_32F); // TODO: revise this conversion in 5.x |
Contributor
Author
There was a problem hiding this comment.
@fengyuentau Could you take a look on TopK behavior in 5.x? There was TODO to remove the conversion. I removed the original one, by have to add another one to fix test. Both output_ref_ind and output_res_ind are FP32 now.
Member
There was a problem hiding this comment.
Well, it needs to be handled in getType in the layer impementation but 4.x does not have this. I can prepare a dedicated one for the 5.x merge.
9d93106 to
3b01578
Compare
mshabunin
approved these changes
Aug 28, 2024
4 tasks
3b01578 to
ed9452c
Compare
4 tasks
| result = pairwiseOperandProcess(!result.empty() ? result : rawInputs[0], | ||
| !result.empty() ? tmpResult : homogenizedInputDims[0], | ||
| (!preProcessedInputs.empty() && !preProcessedInputs[input].empty()) ? preProcessedInputs[input] : rawInputs[input], | ||
| (!preProcessedInputs[input].empty()) ? preProcessedInputs[input] : rawInputs[input], |
Contributor
There was a problem hiding this comment.
Why is pre-check removed?
(anyway it is wrong as it doesn't check vector size vs index)
Contributor
Author
There was a problem hiding this comment.
After #26059 the preProcessedInputs is resized, but not reserved. As soon as the layer has inputs, the vector is not empty. I just selected 4.x version.
ed9452c to
100db1b
Compare
opencv-alalek
approved these changes
Aug 28, 2024
Merged
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 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.
Contrib: opencv/opencv_contrib#3783
Extra: opencv/opencv_extra#1205
#23279 from fengyuentau:add_topk
#25832 from chachoi-world:4.x
#25959 from arvind-iyer:4.x
#25968 from FantasqueX:correct-bayer2gray-simd-1
#25970 from savuor:rv/hal_pyrdown
#25980 from ericmariasis:eric-mariasis-stitcher-py-markdown
#25981 from Kumataro:fix25971
#25986 from asmorkalov:as/js_for_contrib
#25996 from asmorkalov:as/fillPoly_check
#26002 from nishanthdass:doc/missing-fields-python-tutorials
#26004 from ericmariasis:eric-mariasis-issue-26000
#26009 from alexlyulkov:al/unify-build-gradle
#26014 from MaximSmolskiy:increase-search-radius-for-corners-neighbors-in-ChessBoardDetector-findQuadNeighbors
#26018 from Kumataro:fix26017
#26019 from shengyu7697:fix-typo
#26022 from Kumataro:fix26016
#26029 from fengyuentau:dnn/fix_cuda_matmul_crash
#26031 from FantasqueX:fix-typo-2
#26032 from FantasqueX:fix-typo-3
#26034 from Octopus136:issue-26033
#26038 from shengyu7697:fix-typo
#26041 from knmcguire:patch-1
#26045 from asmorkalov:as/variant-free
#26052 from savuor:rv/rounding_lock
#26053 from alexlyulkov:al/opencl-conformance-tests
#26054 from asmorkalov:as/warping_perf
#26059 from Abdurrahheem:ash/fix-einsum-allocation
#26061 from penghuiho:fix-pow-bug
#26062 from asmorkalov:as/pow_ocl_duplicate
#26063 from mshabunin:fix-config-and-doc
#26069 from hanliutong:fix-medianBlur
Ported to opencv_contrib with related PR:
#26046 from ivafanas:speedup_random_forest_get_votes
Previous "Merge 4.x": #25998