Conversation
Conflicts: CMakeLists.txt
…into opencv-3.1 Conflicts: include/common.h src/common.cpp src/dense_flow_gpu.cpp
* Add std::vector * Add std::string * Add std:: and easylogging include * Update headers and add windowedMatchingMask func * Add cv:: namespace to countNonZero The compiler was reporting it to be ambiguous due to existing in both `cv::` and `cv::cuda::`. * Update call to SURF detector and extractor * Update calls to GPU dense flow functions * Fix namespace issues in extract warp flow * Replicate changes to Python interface * Clean code and add TODO * Fix command-line arguments to CV 3.1 * Change copyTo to download * Instantiate py_denseflow alg_tvl1 * Add @yjxiong usage example for libpydenseflow Use as $ python tools/action_flow.py * Extract from a video using pyflow * Rename action_flow.py to extract_flow.py
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
3 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.
No description provided.