fixed some warnings under linux

This commit is contained in:
Vladislav Vinogradov committed 2010-12-22 07:30:21 +00:00
1 parent 0cd587ee34
commit 8190837dd4
4 files changed
+8 -11

No files matched your search

+1 -3
View File
@@ -130,9 +130,7 @@ namespace
{
CV_Assert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels);
CV_Assert(rthis.msg_type == CV_32F || rthis.msg_type == CV_16S);
if (rthis.msg_type == CV_16S)
CV_Assert((1 << (rthis.levels - 1)) * scale * rthis.max_data_term < numeric_limits<short>::max());
CV_Assert(rthis.msg_type == CV_32F || (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)