Merge pull request opencv#11971 from csukuangfj:patch_1

alalek · alalek · commit 10676f86d514 · 2018-07-15T15:06:17.000Z
diff --git a/modules/core/src/check.cpp b/modules/core/src/check.cpp
@@ -44,7 +44,7 @@ static const char* getTestOpMath(unsigned testOp)
 const char* depthToString_(int depth)
 {
     static const char* depthNames[] = { "CV_8U", "CV_8S", "CV_16U", "CV_16S", "CV_32S", "CV_32F", "CV_64F", "CV_USRTYPE1" };
-    return depth <= CV_USRTYPE1 ? depthNames[depth] : NULL;
+    return (depth <= CV_USRTYPE1 && depth >= 0) ? depthNames[depth] : NULL;
 }
 
 const cv::String typeToString_(int type)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ static const char* getTestOpMath(unsigned testOp)`
`44`	`44`	`const char* depthToString_(int depth)`
`45`	`45`	`{`
`46`	`46`	`static const char* depthNames[] = { "CV_8U", "CV_8S", "CV_16U", "CV_16S", "CV_32S", "CV_32F", "CV_64F", "CV_USRTYPE1" };`
`47`		`- return depth <= CV_USRTYPE1 ? depthNames[depth] : NULL;`
	`47`	`+ return (depth <= CV_USRTYPE1 && depth >= 0) ? depthNames[depth] : NULL;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`const cv::String typeToString_(int type)`