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

dnn(onnx): handle unaligned access in ONNX importer

Browse Source
This commit is contained in:
Alexander Alekhin 2020-01-17 16:38:58 +03:00
parent 16b13c6e3b
commit 55d54b56bf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/dnn/src/onnx/onnx_importer.cpp
View File

@ -147,8 +147,18 @@ Mat getMatFromTensor(opencv_onnx::TensorProto& tensor_proto)
} }
else else
{ {
char* val = const_cast<char*>(tensor_proto.raw_data().c_str()); const char* val = tensor_proto.raw_data().c_str();
int64_t* src = reinterpret_cast<int64_t*>(val); // Aligned pointer is required: https://github.com/opencv/opencv/issues/16373
// this doesn't work: typedef int64_t CV_DECL_ALIGNED(1) unaligned_int64_t;
AutoBuffer<int64_t, 16> aligned_val;
if (!isAligned<sizeof(int64_t)>(val))
{
size_t sz = tensor_proto.raw_data().size();
aligned_val.allocate(divUp(sz, sizeof(int64_t)));
memcpy(aligned_val.data(), val, sz);
val = (const char*)aligned_val.data();
}
const int64_t* src = reinterpret_cast<const int64_t*>(val);
convertInt64ToInt32(src, dst, blob.total()); convertInt64ToInt32(src, dst, blob.total());
} }
} }