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

expanded the CV_Assert in pyrdown_ to check for empty mats

Browse Source
This commit is contained in:
berak
2013-07-30 17:32:48 +02:00
parent c4e1edbb83
commit 03c4a6299b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgproc/src/pyramids.cpp
View File

@@ -203,7 +203,8 @@ pyrDown_( const Mat& _src, Mat& _dst, int borderType )
CastOp castOp; CastOp castOp;
VecOp vecOp; VecOp vecOp;
CV_Assert( std::abs(dsize.width*2 - ssize.width) <= 2 && CV_Assert( ssize.width > 0 && ssize.height > 0 &&
std::abs(dsize.width*2 - ssize.width) <= 2 &&
std::abs(dsize.height*2 - ssize.height) <= 2 ); std::abs(dsize.height*2 - ssize.height) <= 2 );
int k, x, sy0 = -PD_SZ/2, sy = sy0, width0 = std::min((ssize.width-PD_SZ/2-1)/2 + 1, dsize.width); int k, x, sy0 = -PD_SZ/2, sy = sy0, width0 = std::min((ssize.width-PD_SZ/2-1)/2 + 1, dsize.width);