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

fixed warnings

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-03-28 11:49:47 +04:00
parent 76e748ccc1
commit 2661c2e213
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/nonfree/src/surf_gpu.cpp
View File

@ -223,6 +223,9 @@ namespace
} }
private: private:
SURF_GPU_Invoker(const SURF_GPU_Invoker&);
SURF_GPU_Invoker& operator =(const SURF_GPU_Invoker&);
SURF_GPU& surf_; SURF_GPU& surf_;
int img_cols, img_rows; int img_cols, img_rows;

10
modules/softcascade/src/cuda/icf-sc.cu
View File

@ -82,8 +82,8 @@ typedef unsigned char uchar;
} }
template<int FACTOR> template<int FACTOR>
__global__ void shrink(const uchar* __restrict__ hogluv, const int inPitch, __global__ void shrink(const uchar* __restrict__ hogluv, const size_t inPitch,
uchar* __restrict__ shrank, const int outPitch ) uchar* __restrict__ shrank, const size_t outPitch )
{ {
const int y = blockIdx.y * blockDim.y + threadIdx.y; const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x; const int x = blockIdx.x * blockDim.x + threadIdx.x;
@ -127,7 +127,7 @@ typedef unsigned char uchar;
__v = static_cast<uchar>((V + 140.f) * (255.f / (122.f + 140.f ))); __v = static_cast<uchar>((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 y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x; const int x = blockIdx.x * blockDim.x + threadIdx.x;
@ -256,8 +256,8 @@ typedef unsigned char uchar;
// ToDo: use textures or uncached load instruction. // ToDo: use textures or uncached load instruction.
__global__ void magToHist(const uchar* __restrict__ mag, __global__ void magToHist(const uchar* __restrict__ mag,
const float* __restrict__ angle, const int angPitch, const float* __restrict__ angle, const size_t angPitch,
uchar* __restrict__ hog, const int hogPitch, const int fh) uchar* __restrict__ hog, const size_t hogPitch, const int fh)
{ {
const int y = blockIdx.y * blockDim.y + threadIdx.y; const int y = blockIdx.y * blockDim.y + threadIdx.y;
const int x = blockIdx.x * blockDim.x + threadIdx.x; const int x = blockIdx.x * blockDim.x + threadIdx.x;

2
modules/softcascade/src/detector_cuda.cpp
View File

@ -274,7 +274,7 @@ struct cv::softcascade::SCascade::Fields
bool check(float mins,float maxs, int scales) 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; minScale = mins;
maxScale = maxScale; maxScale = maxScale;