Merge branch 'home'

13 years ago · cdad4ac7c9
parent 6d3fecd490
commit cdad4ac7c9
1 changed files with 2 additions and 2 deletions
--- 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()) );
 }