projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17fd1c7
)
fixed #2113
author
Marina Kolpakova
<no@email>
Sat, 30 Jun 2012 09:37:40 +0000
(09:37 +0000)
committer
Marina Kolpakova
<no@email>
Sat, 30 Jun 2012 09:37:40 +0000
(09:37 +0000)
modules/gpu/src/matrix_operations.cpp
patch
|
blob
|
history
diff --git
a/modules/gpu/src/matrix_operations.cpp
b/modules/gpu/src/matrix_operations.cpp
index
9dd832c
..
711ff11
100644
(file)
--- a/
modules/gpu/src/matrix_operations.cpp
+++ b/
modules/gpu/src/matrix_operations.cpp
@@
-189,12
+189,12
@@
GpuMat cv::gpu::CudaMem::createGpuMatHeader () const { throw_nogpu(); return Gpu
\r
#else /* !defined (HAVE_CUDA) */
\r
\r
-void registerPageLocked(Mat& m)
\r
+void
cv::gpu::
registerPageLocked(Mat& m)
\r
{
\r
cudaSafeCall( cudaHostRegister(m.ptr(), m.step * m.rows, cudaHostRegisterPortable) );
\r
}
\r
\r
-void unregisterPageLocked(Mat& m)
\r
+void
cv::gpu::
unregisterPageLocked(Mat& m)
\r
{
\r
cudaSafeCall( cudaHostUnregister(m.ptr()) );
\r
}
\r