fix_gpu_namespace.patch

Mathieu Barnachon, 2013-03-01 10:29 am

Download (2.1 kB)

 
b/modules/core/src/opengl_interop.cpp
651 651
            #if !defined HAVE_CUDA || defined(CUDA_DISABLER)
652 652
                throw_nocuda();
653 653
            #else
654
                GpuMat dmat = arr.getGpuMat();
654
		gpu::GpuMat dmat = arr.getGpuMat();
655 655
                impl_->copyFrom(dmat.data, dmat.step, dmat.cols * dmat.elemSize(), dmat.rows);
656 656
            #endif
657 657

  
......
697 697
            #if !defined HAVE_CUDA || defined(CUDA_DISABLER)
698 698
                throw_nocuda();
699 699
            #else
700
                GpuMat& dmat = arr.getGpuMatRef();
700
		gpu::GpuMat& dmat = arr.getGpuMatRef();
701 701
                dmat.create(rows_, cols_, type_);
702 702
                impl_->copyTo(dmat.data, dmat.step, dmat.cols * dmat.elemSize(), dmat.rows);
703 703
            #endif
......
1020 1020
            #if !defined HAVE_CUDA || defined(CUDA_DISABLER)
1021 1021
                throw_nocuda();
1022 1022
            #else
1023
                GpuMat dmat = arr.getGpuMat();
1023
		gpu::GpuMat dmat = arr.getGpuMat();
1024 1024
                GlBuffer buf(dmat, GlBuffer::PIXEL_UNPACK_BUFFER);
1025 1025
                buf.bind(GlBuffer::PIXEL_UNPACK_BUFFER);
1026 1026
                impl_ = new Impl(internalFormats[cn], asize.width, asize.height, srcFormats[cn], gl_types[depth], 0, autoRelease);
......
1133 1133
            #if !defined HAVE_CUDA || defined(CUDA_DISABLER)
1134 1134
                throw_nocuda();
1135 1135
            #else
1136
                GpuMat dmat = arr.getGpuMat();
1136
		gpu::GpuMat dmat = arr.getGpuMat();
1137 1137
                GlBuffer buf(dmat, GlBuffer::PIXEL_UNPACK_BUFFER);
1138 1138
                buf.bind(GlBuffer::PIXEL_UNPACK_BUFFER);
1139 1139
                impl_->copyFrom(asize.width, asize.height, srcFormats[cn], gl_types[depth], 0);