fixed shape() function (#1177)

vpisarev · web-flow · commit f78bb2c4e731 · 2017-05-23T22:01:35.000+03:00
diff --git a/modules/dnn/include/opencv2/dnn/shape_utils.hpp b/modules/dnn/include/opencv2/dnn/shape_utils.hpp
@@ -130,14 +130,9 @@ static inline MatShape shape(const int* dims, const int n = 4)
     return shape;
 }
 
-static inline MatShape shape(const MatSize& size)
-{
-    return shape((const int*)size, size.dims());
-}
-
 static inline MatShape shape(const Mat& mat)
 {
-    return shape(mat.size);
+    return shape(mat.size.p, mat.dims);
 }
 
 namespace {inline bool is_neg(int i) { return i < 0; }}

Original file line number	Diff line number	Diff line change
`@@ -130,14 +130,9 @@ static inline MatShape shape(const int* dims, const int n = 4)`
`130`	`130`	`return shape;`
`131`	`131`	`}`
`132`	`132`
`133`		`-static inline MatShape shape(const MatSize& size)`
`134`		`-{`
`135`		`- return shape((const int*)size, size.dims());`
`136`		`-}`
`137`		`-`
`138`	`133`	`static inline MatShape shape(const Mat& mat)`
`139`	`134`	`{`
`140`		`- return shape(mat.size);`
	`135`	`+ return shape(mat.size.p, mat.dims);`
`141`	`136`	`}`
`142`	`137`
`143`	`138`	`namespace {inline bool is_neg(int i) { return i < 0; }}`