Skip to content

(5.x) Merge 4.x#25422

Merged
asmorkalov merged 34 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x
Apr 16, 2024
Merged

(5.x) Merge 4.x#25422
asmorkalov merged 34 commits intoopencv:5.xfrom
asmorkalov:5.x-merge-4.x

Conversation

@asmorkalov
Copy link
Copy Markdown
Contributor

OpenCV Contrib: opencv/opencv_contrib#3721
OpenCV Extra: None

#25107 from catree:fix_mistake_reprojectImageTo3D_doc
#25306 from utibenkei:fix_build_of_dynamic_framework_for_visionos
#25343 from asmorkalov:as/HAL_bilaterialFilter
#25351 from Kumataro:fix25073_format_g
#25365 from MaximSmolskiy:take-first-suitable-neighbor-in-ChessBoardDetector-findQuadNeighbors
#25377 from eplankin:3.4
#25378 from AleksandrPanov:move_charuco_tutorial
#25383 from asmorkalov:as/win32_arm_ci
#25385 from asmorkalov:as/new_contours_cleanup
#25387 from fengyuentau:complete-float16_t-renaming
#25388 from asmorkalov:as/jpeg-turbo-diagnostics
#25391 from Kumataro:refix25073
#25395 from susumu-iino:fix-dnn-plugin-build-win32
#25396 from mshabunin:test-tag-contours
#25405 from VadimLevin:dev/vlevin/ios-framework-privacy-info
#25406 from VadimLevin:dev/vlevin/numpy-array-typing-constraints
#25407 from Kumataro:fix25401
#25413 from Linaname:#25404

Previous "Merge 4.x": #25384

catree and others added 30 commits February 26, 2024 17:08
…eTo3D_doc

Fix mistake into the reprojectImageTo3D doc. Backport from opencv#25083 PR.
Added experimental build for Windows ARM64 to CI.
Removed old C API usage in new findContours implementation
core: persistence: output reals as human-friendly expression. opencv#25351

Close opencv#25073
Related opencv#25087

This patch is need to merge same time with opencv/opencv_contrib#3714

### 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
…ramework_for_visionos

fix build of dynamic framework for visionos
core: persistence: use hfloat instead of float16_t
…enaming

Rename remaining float16_t for future proof opencv#25387

Resolves comment: opencv#25217 (comment).

`std::float16_t` and `std::bfloat16_t` are introduced since c++23: https://en.cppreference.com/w/cpp/types/floating-point.

### 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
…ork-privacy-info

feat: add PrivacyInfo file to iOS framework
…y-typing-constraints

feat: use numeric dtype for MatLike instead of generic
…tics

Fixed jpeg-turbo diagnostics and build options in default configuration.
imgproc: doc: fix arrow symbols in header
* Update IPP integration

* Updated packages and hashes
…e-neighbor-in-ChessBoardDetector-findQuadNeighbors

Take first suitable neighbor in ChessBoardDetector::findQuadNeighbors
alalek and others added 3 commits April 15, 2024 11:51
…rial

Move Charuco/Calib tutorials and samples to main repo opencv#25378

Merge with opencv/opencv_contrib#3708

Move Charuco/Calib tutorials and samples to main repo:

- [x] update/fix charuco_detection.markdown and samples
- [x] update/fix charuco_diamond_detection.markdown and samples
- [x] update/fix aruco_calibration.markdown and samples
- [x] update/fix aruco_faq.markdown
- [x] move tutorials, samples and tests to main repo
- [x] remove old tutorials, samples and tests from contrib


### 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
Correct inpainting floating point values with Telea's algorithm
@opencv-alalek
Copy link
Copy Markdown
Contributor

From 4.x changes:

+  Windows10-ARM64:
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-4.x-W10-ARM64.yaml@main
+

Is there anything for 5.x?

@asmorkalov
Copy link
Copy Markdown
Contributor Author

Windows ARM CI for 5.x is in progress: opencv/ci-gha-workflow#170

@asmorkalov asmorkalov added this to the 5.0 milestone Apr 16, 2024
@asmorkalov asmorkalov merged commit db3e562 into opencv:5.x Apr 16, 2024
Comment on lines +936 to +938
#if !defined(__OPENCV_BUILD) && !(defined __STDCPP_FLOAT16_T__) && !(defined __ARM_NEON)
typedef hfloat float16_t;
#endif
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be dropped in 5.x. That's to say no float16_t in 5.x even for external user.

@shijunz
Copy link
Copy Markdown

shijunz commented Jun 14, 2025

From 4.x changes:

+  Windows10-ARM64:
+    uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-4.x-W10-ARM64.yaml@main
+

Is there anything for 5.x?

o , which branch? it is ok now?

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.