Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

(4.x) Merge 3.4#21317

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
alalek merged 11 commits intoopencv:4.xfromalalek:merge-3.4
Dec 22, 2021
Merged

(4.x) Merge 3.4#21317

alalek merged 11 commits intoopencv:4.xfromalalek:merge-3.4
Dec 22, 2021

Conversation

@alalek
Copy link
Member

@alalekalalek commentedDec 22, 2021
edited
Loading

#21114 from dwardor:patch-1
#21295 from alalek:update_ffmpeg_3.4
#21297 from rogday:div_fix
#21302 from alalek:issue_21299_3.4
#21313 from alalek:fix_links_3.4

Previous "Merge 3.4":#21288

Details
buildworker:Win64 OpenCL=windows-2Xbuildworker:Custom=linux-1,linux-2,linux-4,linux-6buildworker:Docs=linux-4,linux-6build_image:Docs=docs-js:18.04build_image:Custom=javascriptbuildworker:Custom=linux-4,linux-6Xbuild_image:Custom=javascript-simdXbuild_image:Custom=powerpc64leXbuild_image:Custom=ubuntu-openvino-2019r3.0:16.04Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04Xbuild_image:Custom=ubuntu-openvino-2020.4.0:16.04Xbuild_image:Custom=ubuntu-openvino-2021.1.0:20.04Xbuild_image:Custom=ubuntu-openvino-2021.2.0:20.04Xbuild_image:Custom=ubuntu-openvino-2021.3.0:20.04Xbuild_image:Custom=ubuntu-openvino-2021.4.0:20.04Xbuild_image:Custom=ubuntu-openvino-2021.4.1:20.04Xbuild_image:Custom=ubuntu-openvino-2021.4.2:20.04Xbuildworker:Custom=linux-1Xbuild_image:Custom=ubuntu-vulkan:16.04Xbuildworker:Custom=linux-4Xbuild_image:Custom=fedora:28Xbuild_image:Custom=ubuntu-cuda:16.04Xbuild_image:Custom=ubuntu-clang:18.04Xbuild_image:Custom=ubuntu:20.04Xbuildworker:Custom=linux-1Xbuild_image:Custom=javascript-simdXbuild_image:Custom=mips64elXbuild_image:Custom Mac=openvino-2019r3.0Xbuild_image:Custom Mac=openvino-2020.3.0Xbuild_image:Custom Mac=openvino-2020.4.0Xbuild_image:Custom Mac=openvino-2021.1.0Xbuild_image:Custom Mac=openvino-2021.2.0Xbuild_image:Custom Mac=openvino-2021.3.0Xbuild_image:Custom Mac=openvino-2021.4.0Xbuild_image:Custom Mac=openvino-2021.4.1build_image:Custom Mac=openvino-2021.4.2test_modules:Custom Mac=dnn,gapi,python2,python3,javaXbuild_image:Custom Win=openvino-2019r3.0Xbuild_image:Custom Win=openvino-2020.3.0Xbuild_image:Custom Win=openvino-2020.4.0Xbuild_image:Custom Win=openvino-2021.1.0Xbuild_image:Custom Win=openvino-2021.2.0Xbuild_image:Custom Win=openvino-2021.3.0Xbuild_image:Custom Win=openvino-2021.4.0Xbuild_image:Custom Win=openvino-2021.4.1build_image:Custom Win=openvino-2021.4.2buildworker:Custom Win=windows-3test_bigdata:Custom Win=1test_filter:Custom Win=*test_modules:Custom Win=dnn,gapi,python2,python3,javatest_opencl:Custom Win=ONbuild_contrib:Custom Win=OFFXbuild_image:Custom Win=msvs2017Xbuild_image:Custom Win=msvs2019

alalekand others added11 commitsDecember 20, 2021 15:03
* Fix compile against lapack-3.10.0Fix compilation against lapack >= 3.9.1 and 3.10.0 while not breaking older versionsOpenCVFindLAPACK.cmake & CMakeLists.txt: determine OPENCV_USE_LAPACK_PREFIX from LAPACK_VERSIONhal_internal.cpp : Only apply LAPACK_FUNC to functions whose number of inputs depends on LAPACK_FORTRAN_STR_LEN in lapack >= 3.9.1lapack_check.cpp : remove LAPACK_FUNC which is not OK as function are not used with input parameters (so lapack.h preprocessing of "LAPACK_xxxx(...)" is not applicable with lapack >= 3.9.1If not removed lapack_check fails so LAPACK is deactivated in build (not want we want)use OCV_ prefix and don't use Global, instead generate OCV_LAPACK_FUNC depending on CMake ConditionsRemove CONFIG from find_package(LAPACK) and use LAPACK_GLOBAL and LAPACK_NAME to figure out if using netlib's reference LAPACK implementation and how to #define OCV_LAPACK_FUNC(f)* Fix typos and grammar in comments
@alalek
Copy link
MemberAuthor

👍

@alalekalalek merged commit9777fba intoopencv:4.xDec 22, 2021
@alalekalalek mentioned this pull requestDec 24, 2021
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

@alalekalalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@alalek@rogday@dwardor

[8]ページ先頭

©2009-2025 Movatter.jp