Merge pull request opencv#13347 from alalek:kw_resize_check

alalek · alalek · commit 39e448f7be39 · 2018-12-03T14:44:41.000Z
diff --git a/modules/imgproc/src/resize.cpp b/modules/imgproc/src/resize.cpp
@@ -3782,9 +3782,9 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
     Size ssize = _src.size();
 
     CV_Assert( !ssize.empty() );
-    CV_Assert( !dsize.empty() || (inv_scale_x > 0 && inv_scale_y > 0) );
     if( dsize.empty() )
     {
+        CV_Assert(inv_scale_x > 0); CV_Assert(inv_scale_y > 0);
         dsize = Size(saturate_cast<int>(ssize.width*inv_scale_x),
                      saturate_cast<int>(ssize.height*inv_scale_y));
         CV_Assert( !dsize.empty() );
@@ -3793,6 +3793,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
     {
         inv_scale_x = (double)dsize.width/ssize.width;
         inv_scale_y = (double)dsize.height/ssize.height;
+        CV_Assert(inv_scale_x > 0); CV_Assert(inv_scale_y > 0);
     }
 
     if (interpolation == INTER_LINEAR_EXACT && (_src.depth() == CV_32F || _src.depth() == CV_64F))

Original file line number	Diff line number	Diff line change
`@@ -3782,9 +3782,9 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,`
`3782`	`3782`	`Size ssize = _src.size();`
`3783`	`3783`
`3784`	`3784`	`CV_Assert( !ssize.empty() );`
`3785`		`- CV_Assert( !dsize.empty() \|\| (inv_scale_x > 0 && inv_scale_y > 0) );`
`3786`	`3785`	`if( dsize.empty() )`
`3787`	`3786`	`{`
	`3787`	`+ CV_Assert(inv_scale_x > 0); CV_Assert(inv_scale_y > 0);`
`3788`	`3788`	`dsize = Size(saturate_cast<int>(ssize.width*inv_scale_x),`
`3789`	`3789`	`saturate_cast<int>(ssize.height*inv_scale_y));`
`3790`	`3790`	`CV_Assert( !dsize.empty() );`
`@@ -3793,6 +3793,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,`
`3793`	`3793`	`{`
`3794`	`3794`	`inv_scale_x = (double)dsize.width/ssize.width;`
`3795`	`3795`	`inv_scale_y = (double)dsize.height/ssize.height;`
	`3796`	`+ CV_Assert(inv_scale_x > 0); CV_Assert(inv_scale_y > 0);`
`3796`	`3797`	`}`
`3797`	`3798`
`3798`	`3799`	`if (interpolation == INTER_LINEAR_EXACT && (_src.depth() == CV_32F \|\| _src.depth() == CV_64F))`