Merge pull request opencv#9642 from saskatchewancatch:psnr-checks

vpisarev · vpisarev · commit 73298ea87510 · 2017-09-18T09:24:03.000Z
diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
@@ -4150,7 +4150,9 @@ double cv::PSNR(InputArray _src1, InputArray _src2)
 {
     CV_INSTRUMENT_REGION()
 
-    CV_Assert( _src1.depth() == CV_8U );
+    //Input arrays must have depth CV_8U
+    CV_Assert( _src1.depth() == CV_8U && _src2.depth() == CV_8U );
+
     double diff = std::sqrt(norm(_src1, _src2, NORM_L2SQR)/(_src1.total()*_src1.channels()));
     return 20*log10(255./(diff+DBL_EPSILON));
 }

Original file line number	Diff line number	Diff line change
`@@ -4150,7 +4150,9 @@ double cv::PSNR(InputArray _src1, InputArray _src2)`
`4150`	`4150`	`{`
`4151`	`4151`	`CV_INSTRUMENT_REGION()`
`4152`	`4152`
`4153`		`- CV_Assert( _src1.depth() == CV_8U );`
	`4153`	`+ //Input arrays must have depth CV_8U`
	`4154`	`+ CV_Assert( _src1.depth() == CV_8U && _src2.depth() == CV_8U );`
	`4155`	`+`
`4154`	`4156`	`double diff = std::sqrt(norm(_src1, _src2, NORM_L2SQR)/(_src1.total()*_src1.channels()));`
`4155`	`4157`	`return 20*log10(255./(diff+DBL_EPSILON));`
`4156`	`4158`	`}`