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

fixed some warnings under linux

Browse Source
This commit is contained in:
Vladislav Vinogradov
2010-12-22 07:30:21 +00:00
parent 0cd587ee34
commit 8190837dd4
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gpu/src/filtering.cpp
View File

@@ -810,7 +810,6 @@ Ptr<FilterEngine_GPU> cv::gpu::createSeparableLinearFilter_GPU(int srcType, int
if (columnBorderType < 0) if (columnBorderType < 0)
columnBorderType = rowBorderType; columnBorderType = rowBorderType;
int sdepth = CV_MAT_DEPTH(srcType), ddepth = CV_MAT_DEPTH(dstType);
int cn = CV_MAT_CN(srcType); int cn = CV_MAT_CN(srcType);
int bdepth = CV_32F; int bdepth = CV_32F;
int bufType = CV_MAKETYPE(bdepth, cn); int bufType = CV_MAKETYPE(bdepth, cn);

12
modules/gpu/src/imgproc_gpu.cpp
View File

@@ -309,12 +309,12 @@ void cv::gpu::copyMakeBorder(const GpuMat& src, GpuMat& dst, int top, int bottom
dst.create(src.rows + top + bottom, src.cols + left + right, src.type()); dst.create(src.rows + top + bottom, src.cols + left + right, src.type());
NppiSize srcsz; NppiSize srcsz;
srcsz.width = src.cols; srcsz.width = src.cols;
srcsz.height = src.rows; srcsz.height = src.rows;
NppiSize dstsz; NppiSize dstsz;
dstsz.width = dst.cols; dstsz.width = dst.cols;
dstsz.height = dst.rows; dstsz.height = dst.rows;
switch (src.type()) switch (src.type())
{ {
@@ -341,7 +341,7 @@ void cv::gpu::copyMakeBorder(const GpuMat& src, GpuMat& dst, int top, int bottom
} }
case CV_32FC1: case CV_32FC1:
{ {
float val = static_cast<float>(value[0]); Npp32f val = static_cast<Npp32f>(value[0]);
Npp32s nVal = *(reinterpret_cast<Npp32s*>(&val)); Npp32s nVal = *(reinterpret_cast<Npp32s*>(&val));
nppSafeCall( nppiCopyConstBorder_32s_C1R(src.ptr<Npp32s>(), src.step, srcsz, nppSafeCall( nppiCopyConstBorder_32s_C1R(src.ptr<Npp32s>(), src.step, srcsz,
dst.ptr<Npp32s>(), dst.step, dstsz, top, left, nVal) ); dst.ptr<Npp32s>(), dst.step, dstsz, top, left, nVal) );

2
modules/gpu/src/match_template.cpp
View File

@@ -577,7 +577,7 @@ void cv::gpu::matchTemplate(const GpuMat& image, const GpuMat& templ, GpuMat& re
static const Caller callers32F[] = { ::matchTemplate_SQDIFF_32F, 0, static const Caller callers32F[] = { ::matchTemplate_SQDIFF_32F, 0,
::matchTemplate_CCORR_32F, 0, 0, 0 }; ::matchTemplate_CCORR_32F, 0, 0, 0 };
const Caller* callers; const Caller* callers = 0;
switch (image.depth()) switch (image.depth())
{ {
case CV_8U: callers = callers8U; break; case CV_8U: callers = callers8U; break;

4
modules/gpu/src/stereobp.cpp
View File

@@ -130,9 +130,7 @@ namespace
{ {
CV_Assert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels); CV_Assert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels);
CV_Assert(rthis.msg_type == CV_32F || rthis.msg_type == CV_16S); CV_Assert(rthis.msg_type == CV_32F || rthis.msg_type == CV_16S);
CV_Assert(rthis.msg_type == CV_32F || (1 << (rthis.levels - 1)) * scale * rthis.max_data_term < numeric_limits<short>::max());
if (rthis.msg_type == CV_16S)
CV_Assert((1 << (rthis.levels - 1)) * scale * rthis.max_data_term < numeric_limits<short>::max());
} }
void operator()(const GpuMat& left, const GpuMat& right, GpuMat& disp, cudaStream_t stream) void operator()(const GpuMat& left, const GpuMat& right, GpuMat& disp, cudaStream_t stream)