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

(5.x) Merge 4.x #23149

Merged
merged 17 commits into from
Jan 18, 2023
Merged

(5.x) Merge 4.x #23149

merged 17 commits into from
Jan 18, 2023

Conversation

alalek
Copy link
Member

@alalek alalek commented Jan 18, 2023

#22938 from Xxfore:4.x
#23062 from cudawarped:cuda_add_lovelace_hopper
#23087 from lukasalexanderweber:4.x
#23095 from fengyuentau:fix_omp_macos
#23096 from zihaomu:issue_23074
#23112 from zihaomu:fix_x86_winograd
#23114 from smeng9:4.x
#23126 from cudawarped:fix_issue_3412
#23141 from mshabunin:backport-c-cleanup

Previous "Merge 4.x": #23113

build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-1

lukasalexanderweber and others added 17 commits January 3, 2023 22:45
fix typo: stetDictionary to setDictionary
add GraphCutSeamFinder to stitching_detailed.py
Use reinterpret instead of c-style casting for GCC

Co-authored-by: Xu Zhang <xu.zhang@hexintek.com>
Co-authored-by: Maksim Shabunin <maksim.shabunin@gmail.com>
* fix openmp include and link issue on macos

* turn off have_openmp if OpenMP_CXX_INCLUDE_DIRS is empty

* test commit

* use condition HAVE_OPENMP and OpenMP_CXX_LIBRARIES for linking

* remove trailing whitespace

* remove notes

* update conditions

* use OpenMP_CXX_LIBRARIES for linking
@alalek
Copy link
Member Author

alalek commented Jan 18, 2023

👍

@alalek alalek merged commit a42d879 into opencv:5.x Jan 18, 2023
@alalek alalek mentioned this pull request Jan 28, 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

9 participants