generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1492 from jet47:gpucodec-cudev

Browse Source
This commit is contained in:
Roman Donchenko
2013-10-21 16:30:13 +04:00
committed by OpenCV Buildbot
parent f25b77ff1e 776c0cb08c
commit e290436a4c
6 changed files with 87 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cudev/include/opencv2/cudev/ptr2d/glob.hpp
View File

@@ -72,7 +72,7 @@ template <typename T> struct GlobPtrSz : GlobPtr<T>
};
template <typename T>
__host__ GlobPtr<T> globPtr(T* data, size_t step)
__host__ __device__ GlobPtr<T> globPtr(T* data, size_t step)
{
GlobPtr<T> p;
p.data = data;
@@ -81,7 +81,7 @@ __host__ GlobPtr<T> globPtr(T* data, size_t step)
}
template <typename T>
__host__ GlobPtrSz<T> globPtr(T* data, size_t step, int rows, int cols)
__host__ __device__ GlobPtrSz<T> globPtr(T* data, size_t step, int rows, int cols)
{
GlobPtrSz<T> p;
p.data = data;