Skip to content
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

(4.x) Merge 3.4 #23827

Merged
merged 12 commits into from Jun 20, 2023
Merged

(4.x) Merge 3.4 #23827

merged 12 commits into from Jun 20, 2023

Conversation

asmorkalov
Copy link
Contributor

@asmorkalov asmorkalov commented Jun 19, 2023

#22798 from lamm45:distransform-large
#23664 from asmorkalov:as/solveLP_infeasible
#23692 from asmorkalov:as/ffmpeg_fps_3.4
#23729 from asmorkalov:as/create_samples_overflow
#23768 from opencv-pushbot:gitee/alalek/issue_23156

Previous "Merge 3.4": #23667

force_builders=Custom
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-1,linux-4,linux-f1

asmorkalov and others added 11 commits May 25, 2023 17:29
Added final constrants check to solveLP to filter out flating-point numeric issues
backport to 3.4: Fixed FPS computation on some videos for FFmpeg backend
…rflow

Fixed potential buffer overflow of user file name in create_samples_app
…e_23156

build(ios): disable workaround for CMake 3.25.1+
[opencv 3.x] back-ported tbb support ubuntu 22.04
Fix distransform to work with large images opencv#22798

This attempts to fix the following bug which was caused by storing squares of large integers into 32-bit floating point variables:
opencv#22732


### 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
modules/core/include/opencv2/core/optim.hpp Outdated Show resolved Hide resolved
modules/core/src/lpsolver.cpp Outdated Show resolved Hide resolved
modules/core/src/lpsolver.cpp Outdated Show resolved Hide resolved
@asmorkalov asmorkalov force-pushed the merge-3.4 branch 2 times, most recently from eeebdf0 to 004801f Compare June 20, 2023 06:57
@asmorkalov asmorkalov merged commit 004801f into opencv:4.x Jun 20, 2023
21 checks passed
@asmorkalov asmorkalov mentioned this pull request Jun 23, 2023
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.

None yet

6 participants