mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 14:06:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18830 from l-bat:issue_18785

Browse Source
This commit is contained in:
Alexander Alekhin 2020-11-17 10:40:53 +00:00
commit 025a9647af
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
View File

@ -547,6 +547,19 @@ Mat getMatFromTensor(opencv_onnx::TensorProto& tensor_proto)
CV_Assert(!field.empty()); CV_Assert(!field.empty());
Mat(sizes, CV_64FC1, (void*)field.data()).convertTo(blob, CV_32FC1); Mat(sizes, CV_64FC1, (void*)field.data()).convertTo(blob, CV_32FC1);
} }
else if (datatype == opencv_onnx::TensorProto_DataType_INT32)
{
if (!tensor_proto.int32_data().empty())
{
const ::google::protobuf::RepeatedField<int32_t> field = tensor_proto.int32_data();
Mat(sizes, CV_32SC1, (void*)field.data()).copyTo(blob);
}
else
{
char* val = const_cast<char*>(tensor_proto.raw_data().c_str());
Mat(sizes, CV_32SC1, val).copyTo(blob);
}
}
else if (datatype == opencv_onnx::TensorProto_DataType_INT64) else if (datatype == opencv_onnx::TensorProto_DataType_INT64)
{ {
blob.create(sizes, CV_32SC1); blob.create(sizes, CV_32SC1);