Skip to content

O
opencv_contrib
Commit f78bb2c4 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky Committed by GitHub
Browse files
Options

fixed shape() function (#1177)

parent 4b1834ac
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
modules/dnn/include/opencv2/dnn/shape_utils.hpp
View file @ f78bb2c4
...@@ -130,14 +130,9 @@ static inline MatShape shape(const int* dims, const int n = 4) ...@@ -130,14 +130,9 @@ static inline MatShape shape(const int* dims, const int n = 4)
return shape; return shape;
} }
static inline MatShape shape(const MatSize& size)
{
return shape((const int*)size, size.dims());
}
static inline MatShape shape(const Mat& mat) 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; }} namespace {inline bool is_neg(int i) { return i < 0; }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment