From 2661c2e213642a85b1313b6760740b8bb92f3d11 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 28 Mar 2013 11:49:47 +0400 Subject: [PATCH] fixed warnings --- modules/nonfree/src/surf_gpu.cpp | 3 +++ modules/softcascade/src/cuda/icf-sc.cu | 10 +++++----- modules/softcascade/src/detector_cuda.cpp | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/nonfree/src/surf_gpu.cpp b/modules/nonfree/src/surf_gpu.cpp index f2a01cfdc..f86c001be 100644 --- a/modules/nonfree/src/surf_gpu.cpp +++ b/modules/nonfree/src/surf_gpu.cpp @@ -223,6 +223,9 @@ namespace } private: + SURF_GPU_Invoker(const SURF_GPU_Invoker&); + SURF_GPU_Invoker& operator =(const SURF_GPU_Invoker&); + SURF_GPU& surf_; int img_cols, img_rows; diff --git a/modules/softcascade/src/cuda/icf-sc.cu b/modules/softcascade/src/cuda/icf-sc.cu index 8d65aad0e..6bea94987 100644 --- a/modules/softcascade/src/cuda/icf-sc.cu +++ b/modules/softcascade/src/cuda/icf-sc.cu @@ -82,8 +82,8 @@ typedef unsigned char uchar; } template - __global__ void shrink(const uchar* __restrict__ hogluv, const int inPitch, - uchar* __restrict__ shrank, const int outPitch ) + __global__ void shrink(const uchar* __restrict__ hogluv, const size_t inPitch, + uchar* __restrict__ shrank, const size_t outPitch ) { const int y = blockIdx.y * blockDim.y + threadIdx.y; const int x = blockIdx.x * blockDim.x + threadIdx.x; @@ -127,7 +127,7 @@ typedef unsigned char uchar; __v = static_cast((V + 140.f) * (255.f / (122.f + 140.f ))); } - __global__ void bgr2Luv_d(const uchar* rgb, const int rgbPitch, uchar* luvg, const int luvgPitch) + __global__ void bgr2Luv_d(const uchar* rgb, const size_t rgbPitch, uchar* luvg, const size_t luvgPitch) { const int y = blockIdx.y * blockDim.y + threadIdx.y; const int x = blockIdx.x * blockDim.x + threadIdx.x; @@ -256,8 +256,8 @@ typedef unsigned char uchar; // ToDo: use textures or uncached load instruction. __global__ void magToHist(const uchar* __restrict__ mag, - const float* __restrict__ angle, const int angPitch, - uchar* __restrict__ hog, const int hogPitch, const int fh) + const float* __restrict__ angle, const size_t angPitch, + uchar* __restrict__ hog, const size_t hogPitch, const int fh) { const int y = blockIdx.y * blockDim.y + threadIdx.y; const int x = blockIdx.x * blockDim.x + threadIdx.x; diff --git a/modules/softcascade/src/detector_cuda.cpp b/modules/softcascade/src/detector_cuda.cpp index 19050dcc6..f0d71c60a 100644 --- a/modules/softcascade/src/detector_cuda.cpp +++ b/modules/softcascade/src/detector_cuda.cpp @@ -274,7 +274,7 @@ struct cv::softcascade::SCascade::Fields bool check(float mins,float maxs, int scales) { - bool updated = ((minScale == mins) || (maxScale == maxs) || (totals = scales)); + bool updated = ((minScale == mins) || (maxScale == maxs) || (totals == scales)); minScale = mins; maxScale = maxScale;