Skip to content

5.x merge 4.x#26939

Merged
asmorkalov merged 128 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x
Feb 24, 2025
Merged

5.x merge 4.x#26939
asmorkalov merged 128 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x

Conversation

@asmorkalov
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov commented Feb 19, 2025

Extra: opencv/opencv_extra#1237
Contrib: opencv/opencv_contrib#3885

#26463 from eplankin:icv_update_2022.0.0
#26600 from lawrencec98:Issue25250-lens-distortion-documentation-unclear
#26601 from dai-xin:4.x
#26646 from warped-rudi:refactoring
#26660 from NekoAsakura:4.x
#26662 from RoshniUG:4.x
#26669 from GouMinghao:4.x
#26678 from Kumataro:fix26673
#26717 from s-trinh:add_border_type_doc_examples
#26754 from s-trinh:add_bibtex_direct_pdf_links
#26762 from sturkmen72:avif_cmake
#26765 from asmorkalov:as/android_vulkan_build_fix
#26769 from y-guyon:patch-1
#26773 from MaximSmolskiy:improve-robustness-for-ellipse-fitting
#26776 from vrabaud:ub_warp
#26778 from vidipsingh:doc-fix-fontscale-behavior-puttext
#26782 from vrabaud:png_leak
#26786 from mshabunin/fix-ppc64-gcc15
#26787 from MaximSmolskiy:fix_memory_leaks_for_JpegXLDecoder
#26788 from Kumataro:fix26767
#26789 from amane-ame:minmax_hal_rvv
#26793 from UnnamedOrange:4.x
#26798 from brad0:opencv_powerpc_elf_aux_info
#26800 from shyama7004:fix-cap-orientation-auto-default
#26802 from Kumataro:fix26801
#26803 from brad0:opencl_openbsd
#26804 from amane-ame:norm_hal_rvv
#26805 from MaximSmolskiy:fix-typo-in-matchTemplate-description
#26806 from shyama7004:fix-typo
#26810 from MaximSmolskiy:improve-robustness-for-fitEllipseAMS
#26813 from sturkmen72:fix_animation
#26815 from shyama7004:fix-deprecation
#26820 from johnnynunez:patch-1
#26826 from devatbosch:4.x
#26828 from sturkmen72:imgcodecs_improvements
#26831 from shyama7004:fix-denoising.cpp
#26832 from vrabaud:png
#26835 from sturkmen72:patch-4
#26836 from chacha21:thresholding_compute_threshold_only
#26837 from warped-rudi:zoom
#26841 from MaximSmolskiy:fix_data01.xml-file-for-example_cpp_logistic_regression
#26844 from Kumataro:fix26843
#26846 from MaximSmolskiy:fix_bug_with_int64_support_for_FileStorage
#26847 from IHni3:4.x
#26848 from vrabaud:png
#26850 from shyama7004:update-headers
#26851 from sturkmen72:fix-22551
#26853 from horror-proton:rvv-fast-atan
#26854 from vrabaud:png_leak
#26856 from mshabunin:fix-rvv-tests-2
#26857 from hmaarrfk:patch-1
#26859 from Kumataro:fix26858
#26863 from shyama7004:minor-change
#26866 from opencv:revert-26857-patch-1
#26867 from shyama7004:fix-meanStdDev
#26872 from sturkmen72:ImageEncoders_revisions
#26875 from asmorkalov:as/in_memory_models
#26878 from asmorkalov:as/respect_namespace_hal
#26879 from Malacath-92:4.x
#26882 from shyama7004:nullptr-setidentity
#26884 from lve-gh:split8u_rvv_hal
#26889 from Kumataro:fix26877
#26890 from shyama7004:type-hint
#26891 from MaximSmolskiy:refactor-test-for-filestorage-base64
#26894 from Kumataro:fix26893
#26895 from asmorkalov:as/mean_hal
#26897 from shyama7004:typos-fix
#26898 from mshabunin:fix-riscv-toolchain
#26902 from Kababey:patch-3
#26903 from asmorkalov:as/openvx_hal
#26907 from asmorkalov:as/openvx_hal_features2d
#26908 from shyama7004:_DEBUG/NDEBUG
#26911 from asmorkalov:as/openvx_hal_imgproc
#26915 from mshabunin:fix-png-be
#26917 from asmorkalov:as/static_fastcv
#26920 from ConnorBaker:fix/cmake-matches-uses-regex
#26921 from shyama7004:sampsonDistance
#26927 from asmorkalov:as/squeeze_windows
#26928 from shyama7004:doxFix
#26932 from shyama7004:deprecationFix
#26933 from asmorkalov:as/drop_android_test

Previous "Merge 4.x": #26768

Xci_branch=5.x-merge-4.x
build_image:Docs=docs-js
build_image:Custom=javascript
buildworker:Custom=linux-1,linux-4

dai-xin and others added 30 commits December 9, 2024 17:55
…te the result of each method in the documentation.
This UB can be avoided by postponing calculation until needed.
…ld_fix

Fixed Android build with Vulkan support.
In both cases we add negative value (as unsigned type), so
pointer addition wraps, which is undefined behavior.
Don't overflow pointer addition
- Updated the documentation of the putText function to clarify the behavior of the fontScale parameter.
- Explained how fontScale affects text rendering: magnifying (>1), minimizing (<1), and mirroring (<0).
- Change __unix__ check for feature detection. NetBSD does not
have either API.
- Adds support for OpenBSD/powerpc64.
…emplate-description

Fix typo in matchTemplate description
3rdparty:ittnotify: update to v3.25.4 opencv#26802

Close opencv#26801
See opencv#26797

### 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 an is-empty condition in FFmpeg video capture when parsing FFmpeg options defined in the environment variables
…or_JpegXLDecoder

Fix memory leaks for JpegXLDecoder
Add CMake checks for getauxval and elf_aux_info for POWER
…-for-ellipse-fitting

Improve robustness for ellipse fitting opencv#26773

### Pull Request Readiness Checklist

Related to opencv#26694 

Current noise addition is not very good because for example it turns degenerate case of one horizontal line into degenerate case of two parallel horizontal lines

Improving noise addition leads to improved robustness of algorithms

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
* fix a small typo

* removal of unused variable
…avior-puttext

Added fontScale behavior description to putText() documentation
Added CV_WRAP to Animation struct opencv#26813

closes opencv#26808
### 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
jpegxl: support cv::IMREAD_UNCHANGED and other ImreadFlags opencv#26788

Close opencv#26767

### 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
…-for-fitEllipseAMS

Improve robustness for fitEllipseAMS opencv#26810

### Pull Request Readiness Checklist

Related to opencv#26694 

Added functionality to add noise to points in degenerate cases and try again for `fitEllipseAMS`. `fitEllipseNoDirect` and `fitEllipseDirect` already have this

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
Replaced sprintf with snprintf opencv#26815

Fixes : opencv#26814

### 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
@mshabunin
Copy link
Copy Markdown
Contributor

mshabunin commented Feb 19, 2025

Looks like minMaxIdx and norm produces errors on RISC-V platforms with 5.x tests (related PR #26789, #26804).
CC @amane-ame

2025-02-19T17:29:33.9647110Z [  FAILED  ] 7 tests, listed below:
2025-02-19T17:29:33.9647273Z [  FAILED  ] Core_Array.basic_operations
2025-02-19T17:29:33.9647443Z [  FAILED  ] Mat1D.basic
2025-02-19T17:29:33.9647670Z [  FAILED  ] OCL_Arithm/MinMaxIdx_Mask.Mat/6, where GetParam() = (CV_16S, Channels(1), false)
2025-02-19T17:29:33.9647987Z [  FAILED  ] OCL_Arithm/MinMaxIdx_Mask.Mat/10, where GetParam() = (CV_32F, Channels(1), false)
2025-02-19T17:29:33.9648290Z [  FAILED  ] OCL_Arithm/Normalize.Mat/10, where GetParam() = (CV_32F, Channels(1), false)
2025-02-19T17:29:33.9648582Z [  FAILED  ] OCL_Arithm/Normalize.Mat/12, where GetParam() = (CV_64F, Channels(1), false)
2025-02-19T17:29:33.9649043Z [  FAILED  ] Core_MinMaxLoc/ElemWiseTest.accuracy/0, where GetParam() = 16-byte object <A0-B8 0A-56 55-55 00-00 F0-B8 0A-56 55-55 

@amane-ame
Copy link
Copy Markdown
Contributor

@mshabunin All these failures are caused by the removing of core/src/minmax.cpp. This file is replaced by core/src/minmax.dispatch.cpp in 5.x, but discarding my changes.

@asmorkalov
Copy link
Copy Markdown
Contributor Author

@amane-ame I fixed min-max merge error. Could you take on 1d operations test failure. Looks like it's HAL specific.

@asmorkalov
Copy link
Copy Markdown
Contributor Author

@mshabunin @amane-ame I disabled new minMaxLoc integration for now and failed bug #26947. Please submit extra PR to 5.x to fix the issue and enable the HAL back.

@asmorkalov
Copy link
Copy Markdown
Contributor Author

@opencv-alalek @mshabunin The PR is ready for review.

@asmorkalov asmorkalov merged commit 1483504 into opencv:5.x Feb 24, 2025
26 checks passed
asmorkalov pushed a commit that referenced this pull request Mar 3, 2025
Fix HAL dispatch in cv::minMaxIdx #26946

Closes #26939 (comment).
Closes #26947

### 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
@asmorkalov asmorkalov mentioned this pull request Mar 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.