Skip to content
Snippets Groups Projects
Commit ebd66671 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Use std::memcpy

parent 4c1c0369
No related branches found
No related tags found
1 merge request!193Add proper Image type to Aron and improve visualization in MemoryViewer + some ArMem refactorings
......@@ -161,7 +161,8 @@ namespace armarx::aron::dataIO::reader
auto casted = datanavigator::NDArrayNavigator::DynamicCastAndCheck(current_nav);
std::vector<int> dims = casted->getDimensions();
memcpy(data, casted->getData(), std::accumulate(std::begin(dims), std::end(dims), 1, std::multiplies<int>()));
int size = std::accumulate(std::begin(dims), std::end(dims), 1, std::multiplies<int>());
std::memcpy(data, casted->getData(), static_cast<size_t>(size));
}
// Read primitives
......
......@@ -96,7 +96,8 @@ namespace armarx::aron::dataIO::writer
datanavigator::NDArrayNavigatorPtr aron(new datanavigator::NDArrayNavigator(path));
aron->setDimensions(dims);
aron->setType(t);
aron->setData(std::accumulate(std::begin(dims), std::end(dims), 1, std::multiplies<int>()), data);
int size = std::accumulate(std::begin(dims), std::end(dims), 1, std::multiplies<int>());
aron->setData(static_cast<unsigned int>(size), data);
token->addElement(aron);
}
......
......@@ -115,7 +115,7 @@ namespace armarx::aron::datanavigator
void NDArrayNavigator::setData(unsigned int elements, const unsigned char* src)
{
aron->data = std::vector<unsigned char>(elements);
memcpy(aron->data.data(), src, elements);
std::memcpy(aron->data.data(), src, elements);
}
std::vector<int> NDArrayNavigator::getDimensions() const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment