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
c839a2cc
Commit
c839a2cc
authored
Apr 11, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8525 from nnorwitz:master
parents
6c07b446
24e8cd1a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
warp.hpp
modules/core/include/opencv2/core/cuda/warp.hpp
+1
-1
warp.hpp
modules/cudev/include/opencv2/cudev/warp/warp.hpp
+1
-1
No files found.
modules/core/include/opencv2/core/cuda/warp.hpp
View file @
c839a2cc
...
@@ -64,7 +64,7 @@ namespace cv { namespace cuda { namespace device
...
@@ -64,7 +64,7 @@ namespace cv { namespace cuda { namespace device
static
__device__
__forceinline__
unsigned
int
laneId
()
static
__device__
__forceinline__
unsigned
int
laneId
()
{
{
unsigned
int
ret
;
unsigned
int
ret
;
asm
(
"mov.u32 %0, %laneid;"
:
"=r"
(
ret
)
);
asm
(
"mov.u32 %0, %
%
laneid;"
:
"=r"
(
ret
)
);
return
ret
;
return
ret
;
}
}
...
...
modules/cudev/include/opencv2/cudev/warp/warp.hpp
View file @
c839a2cc
...
@@ -64,7 +64,7 @@ struct Warp
...
@@ -64,7 +64,7 @@ struct Warp
__device__
__forceinline__
static
uint
laneId
()
__device__
__forceinline__
static
uint
laneId
()
{
{
uint
ret
;
uint
ret
;
asm
(
"mov.u32 %0, %laneid;"
:
"=r"
(
ret
));
asm
(
"mov.u32 %0, %
%
laneid;"
:
"=r"
(
ret
));
return
ret
;
return
ret
;
}
}
...
...
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