Merge 3.4 #2013
Merged
Merge 3.4 #2013
Conversation
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
This built correctly before because tests were run with the highgui module enabled. The sfm module links against the features2d module, which brings in the highgui module as an optional target if enabled. Through this path, imread was working correctly despite the file including the wrong header and not declaring its linking dependency.
- Use shfl_down, instead of __shfl_down, on warp scan - Remove race conditions original commit: opencv/opencv@2b6be3c
* Fixed type narrowing issues
|
👍 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
#2007 from tedsteiner:features2d-without-highgui
#2011 from mshabunin:enable-narrowing-warning
Main PR: opencv/opencv#13920
Previous "Merge 3.4": #2006