Merge branch 'home'

cdad4ac7 · Marina Kolpakova · 6d3fecd4 · cdad4ac7
Commit cdad4ac7 authored Jun 30, 2012 by Marina Kolpakova
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

matrix_operations.cpp modules/gpu/src/matrix_operations.cpp +2 -2

No files found.
--- 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

 #else /* !defined (HAVE_CUDA) */

-void registerPageLocked(Mat& m)
+void cv::gpu::registerPageLocked(Mat& m)
 {
    cudaSafeCall( cudaHostRegister(m.ptr(), m.step * m.rows, cudaHostRegisterPortable) );
 }

-void unregisterPageLocked(Mat& m)
+void cv::gpu::unregisterPageLocked(Mat& m)
 {
    cudaSafeCall( cudaHostUnregister(m.ptr()) );
 }