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
be54f123
Commit
be54f123
authored
Nov 16, 2010
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fix
parent
cc6a87fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
matrix_operations.hpp
modules/gpu/include/opencv2/gpu/matrix_operations.hpp
+1
-1
cuda_shared.hpp
modules/gpu/src/cuda/cuda_shared.hpp
+2
-2
No files found.
modules/gpu/include/opencv2/gpu/matrix_operations.hpp
View file @
be54f123
...
...
@@ -207,7 +207,7 @@ inline GpuMat& GpuMat::operator = (const GpuMat& m)
inline
GpuMat
&
GpuMat
::
operator
=
(
const
Mat
&
m
)
{
upload
(
m
);
return
*
this
;
}
template
<
class
T
>
inline
GpuMat
::
operator
DevMem2D_
<
T
>
()
const
{
return
DevMem2D_
<
T
>
(
rows
,
cols
,
(
T
*
)
data
,
step
);
}
template
<
class
T
>
inline
GpuMat
::
operator
PtrStep_
<
T
>
()
const
{
return
PtrStep_
<
T
>
(
*
this
);
}
template
<
class
T
>
inline
GpuMat
::
operator
PtrStep_
<
T
>
()
const
{
return
PtrStep_
<
T
>
(
static_cast
<
DevMem2D_
<
T
>
>
(
*
this
)
);
}
//CPP: void GpuMat::upload(const Mat& m);
...
...
modules/gpu/src/cuda/cuda_shared.hpp
View file @
be54f123
...
...
@@ -64,8 +64,8 @@ namespace cv
}
template
<
class
T
>
static
inline
void
uploadConstant
(
const
char
*
name
,
const
T
&
value
,
cudaStream_t
stream
)
{
cudaSafeCall
(
cudaMemcpyToSymbolAsyc
(
name
,
&
value
,
sizeof
(
T
),
0
,
cudaMemcpyHostToDevice
,
stream
)
);
{
cudaSafeCall
(
cudaMemcpyToSymbolAsy
n
c
(
name
,
&
value
,
sizeof
(
T
),
0
,
cudaMemcpyHostToDevice
,
stream
)
);
}
template
<
class
T
>
static
inline
void
bindTexture
(
const
char
*
name
,
const
DevMem2D_
<
T
>&
img
/*, bool normalized = false,
...
...
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