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

Fixed a minor bug in PtrElemStep::ptr

Browse Source
This commit is contained in:
Anatoly Baksheev 2010-11-01 12:48:47 +00:00
parent 074ba3ed93
commit 4ea811c568
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/include/opencv2/gpu/devmem2d.hpp
View File

@ -105,6 +105,8 @@ namespace cv
{ {
this->step /= PtrStep_<T>::elem_size; this->step /= PtrStep_<T>::elem_size;
} }
__CV_GPU_HOST_DEVICE__ T* ptr(int y = 0) { return data + y * step); }
__CV_GPU_HOST_DEVICE__ const T* ptr(int y = 0) const { return data + y * step; }
private: private:
StaticCheck<256 % sizeof(T) == 0> ElemStepTypeCheck; StaticCheck<256 % sizeof(T) == 0> ElemStepTypeCheck;
}; };

2
modules/gpu/src/cuda/transform.hpp
View File

@ -79,7 +79,7 @@ namespace cv
namespace gpu namespace gpu
{ {
template <typename T, typename D, typename UnOp> template <typename T, typename D, typename UnOp>
static void transform2(const DevMem2D_<T>& src, const DevMem2D_<D>& dst, UnOp op, cudaStream_t stream) static void transform(const DevMem2D_<T>& src, const DevMem2D_<D>& dst, UnOp op, cudaStream_t stream)
{ {
dim3 threads(16, 16, 1); dim3 threads(16, 16, 1);
dim3 grid(1, 1, 1); dim3 grid(1, 1, 1);