From: berak Date: Tue, 30 Jul 2013 15:32:48 +0000 (+0200) Subject: expanded the CV_Assert in pyrdown_ to check for empty mats X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~983^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03c4a6299b8e0d86f7a28a61e1d2118277139294;p=profile%2Fivi%2Fopencv.git expanded the CV_Assert in pyrdown_ to check for empty mats --- diff --git a/modules/imgproc/src/pyramids.cpp b/modules/imgproc/src/pyramids.cpp index e7d315c..672e911 100644 --- a/modules/imgproc/src/pyramids.cpp +++ b/modules/imgproc/src/pyramids.cpp @@ -203,7 +203,8 @@ pyrDown_( const Mat& _src, Mat& _dst, int borderType ) CastOp castOp; 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 ); int k, x, sy0 = -PD_SZ/2, sy = sy0, width0 = std::min((ssize.width-PD_SZ/2-1)/2 + 1, dsize.width);