Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
f444f9b4
Commit
f444f9b4
authored
Oct 04, 2011
by
Anatoly Baksheev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
optflow gpu compilation fix under vs2010
parent
f366553a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
NCVBroxOpticalFlow.cu
modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
+4
-3
utility.hpp
modules/gpu/src/opencv2/gpu/device/utility.hpp
+1
-1
No files found.
modules/gpu/src/nvidia/NCVBroxOpticalFlow.cu
View file @
f444f9b4
...
...
@@ -62,7 +62,7 @@
#include "NPP_staging/NPP_staging.hpp"
#include "NCVBroxOpticalFlow.hpp"
#include "opencv2/gpu/device/utility.hpp"
////////////////////////////////////////////
...
...
@@ -131,6 +131,7 @@ template<typename _Tp> inline shared_ptr<_Tp>& shared_ptr<_Tp>::operator = (cons
return *this;
}
////////////////////////////////////////////
//using std::tr1::shared_ptr;
...
...
@@ -1181,8 +1182,8 @@ NCVStatus NCVBroxOpticalFlow(const NCVBroxOpticalFlowDescriptor desc,
ScaleVector(ptrVNew->ptr(), ptrVNew->ptr(), 1.0f/scale_factor, ns * nh, stream);
}
std
::swap<FloatVector*>(ptrU, ptrUNew);
std
::swap<FloatVector*>(ptrV, ptrVNew);
cv::gpu::device
::swap<FloatVector*>(ptrU, ptrUNew);
cv::gpu::device
::swap<FloatVector*>(ptrV, ptrVNew);
}
scale /= scale_factor;
}
...
...
modules/gpu/src/opencv2/gpu/device/utility.hpp
View file @
f444f9b4
...
...
@@ -58,7 +58,7 @@ namespace cv { namespace gpu { namespace device
///////////////////////////////////////////////////////////////////////////////
// swap
template
<
typename
T
>
void
__device__
__forceinline__
swap
(
T
&
a
,
T
&
b
)
template
<
typename
T
>
void
__device__
__
host__
__
forceinline__
swap
(
T
&
a
,
T
&
b
)
{
const
T
temp
=
a
;
a
=
b
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment