From c923b258f46e9e818eda86524862587490f1b732 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Mon, 1 Nov 2010 15:13:17 +0000 Subject: [PATCH] fixed compilation under gcc --- modules/gpu/include/opencv2/gpu/devmem2d.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gpu/include/opencv2/gpu/devmem2d.hpp b/modules/gpu/include/opencv2/gpu/devmem2d.hpp index eb89794b97..e756e2e38c 100644 --- a/modules/gpu/include/opencv2/gpu/devmem2d.hpp +++ b/modules/gpu/include/opencv2/gpu/devmem2d.hpp @@ -103,10 +103,10 @@ namespace cv { PtrElemStep_(const DevMem2D_& mem) : PtrStep_(mem) { - this->step /= PtrStep_::elem_size; + PtrStep_::step /= PtrStep_::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; } + __CV_GPU_HOST_DEVICE__ T* ptr(int y = 0) { return PtrStep_::data + y * PtrStep_::step; } + __CV_GPU_HOST_DEVICE__ const T* ptr(int y = 0) const { return PtrStep_::data + y * PtrStep_::step; } private: StaticCheck<256 % sizeof(T) == 0> ElemStepTypeCheck; };