From cdad4ac7c91fe440be0fd43c7b011b23bacdba21 Mon Sep 17 00:00:00 2001
From: Marina Kolpakova <no@email>
Date: Sat, 30 Jun 2012 09:29:33 +0000
Subject: [PATCH] Merge branch 'home'

---
 modules/gpu/src/matrix_operations.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gpu/src/matrix_operations.cpp b/modules/gpu/src/matrix_operations.cpp
index 9dd832cb45..711ff118d0 100644
--- 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()) );
 }