Fixed GPU module build with CUDA 5.5 RC on linux#948
Merged
opencv-pushbot merged 4 commits intoopencv:2.4from Jun 5, 2013
Merged
Fixed GPU module build with CUDA 5.5 RC on linux#948opencv-pushbot merged 4 commits intoopencv:2.4from
opencv-pushbot merged 4 commits intoopencv:2.4from
Conversation
added 4 commits
June 4, 2013 13:57
old version isn't compiled with CUDA 5.5 new version doesn't depend on functional.hpp
the output of BroxOpticalFlow differs a bit in CUDA 5.5
+ interpolateFrames and createOpticalFlowNeedleMap
Merged
|
Again, |
to unwedge the automerger.
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
4 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.
Rewrote
gpu/device/vec_math.hppfile (now it doesn't depend onfunctional.hpp).Also fixes several regression and sanity tests failures (NPP Box filter and Brox Optical Flow).