Merged
Conversation
* detect header automatically and not based on version number
backport of commit 7411373
also modify cuda canny to use createTextureObjectPitch2D, etc.
TEngine installation rules fix for static build * Modify cmake config error for -DBUILD_SHARED_LIBS=OFF * Modify for not install tengine include directory * Update compile error. * move install command to tengine/CMakeLists.txt * rm include dir when make install,only build static lib will install libtengine.a
* fixing opencv#17572 opencv#17572 Build for Android failed: "can't concat str to bytes" on Windows 10 64bit with python 3.6.6 * similar to changes in platforms/winpack_dldt/build_package.py
* enable_if_t and is_base_of is c++14 feature * override is c++11 feature
… symbols defined in MinGW headers)
* enable_if_t is a c++14 feature
Contributor
|
I'm sorry to slip in a message in the last minute, but I appreciate if you could pick #17587 in this round of merge. |
Member
Author
|
👍 |
Contributor
|
I confirmed that on both Jetson TX1 and TX2 build passed |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#17468 from liqi-c:sharedlib_build_problem
#17527 from tomoaki0705:detectCuvidHeader
#17533 from alalek:fix_dumpInputArray_nd_case
#17537 from Murazaki:patch-1
#17556 from nglee:dev_optFlowTVL1Async#17557 from alalek:backport_17554#17564 from l-bat:fix_yolov4
#17568 from alalek:cleanup_17527
#17571 from tomoaki0705:fixAutomaticCC
#17573 from alexcohn:fix/android_windows_build
#17577 from philippefoubert:branch_color_yuv_simd
#17578 from Bleach665:fix_win_eigen_build
#17581 from tomoaki0705:fixCudaAsync#17587 from tomoaki0705:fixCUDAOptflowJetsonPrevious "Merge 3.4": #17539