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

Fixed some build warnings; slightly improved python search

Browse Source
This commit is contained in:
Andrey Kamaev
2012-03-02 08:34:54 +00:00
parent 30d5cdef94
commit 2f4bb580fc
6 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/imgproc/test/test_thresh.cpp
View File

@@ -124,17 +124,23 @@ static void test_threshold( const Mat& _src, Mat& _dst,
int i, j;
int depth = _src.depth(), cn = _src.channels();
int width_n = _src.cols*cn, height = _src.rows;
int ithresh = cvFloor(thresh), ithresh2, imaxval = cvRound(maxval);
int ithresh = cvFloor(thresh);
int imaxval, ithresh2;
if( depth == CV_8U )
{
ithresh2 = saturate_cast<uchar>(ithresh);
imaxval = saturate_cast<uchar>(imaxval);
imaxval = saturate_cast<uchar>(maxval);
}
else if( depth == CV_16S )
{
ithresh2 = saturate_cast<short>(ithresh);
imaxval = saturate_cast<short>(imaxval);
imaxval = saturate_cast<short>(maxval);
}
else
{
ithresh2 = cvRound(ithresh);
imaxval = cvRound(maxval);
}
assert( depth == CV_8U || depth == CV_16S || depth == CV_32F );