From 4ea811c568f8219bbbd96569b163d5e72e8cad19 Mon Sep 17 00:00:00 2001
From: Anatoly Baksheev <no@email>
Date: Mon, 1 Nov 2010 12:48:47 +0000
Subject: [PATCH] Fixed a minor bug in PtrElemStep::ptr

---
 modules/gpu/include/opencv2/gpu/devmem2d.hpp | 2 ++
 modules/gpu/src/cuda/transform.hpp           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gpu/include/opencv2/gpu/devmem2d.hpp b/modules/gpu/include/opencv2/gpu/devmem2d.hpp
index 160c2b5..93394bc 100644
--- a/modules/gpu/include/opencv2/gpu/devmem2d.hpp
+++ b/modules/gpu/include/opencv2/gpu/devmem2d.hpp
@@ -105,6 +105,8 @@ namespace cv
             {
                 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:            
             StaticCheck<256 % sizeof(T) == 0>  ElemStepTypeCheck;
         };
diff --git a/modules/gpu/src/cuda/transform.hpp b/modules/gpu/src/cuda/transform.hpp
index 2eab55b..5445674 100644
--- a/modules/gpu/src/cuda/transform.hpp
+++ b/modules/gpu/src/cuda/transform.hpp
@@ -79,7 +79,7 @@ namespace cv
     namespace gpu 
     {
         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 grid(1, 1, 1);
-- 
2.7.4