diff --git a/source/RobotAPI/libraries/aron/core/io/dataIO/reader/navigator/NavigatorReader.cpp b/source/RobotAPI/libraries/aron/core/io/dataIO/reader/navigator/NavigatorReader.cpp index 6c95ec35b8eb3c7ce42bf6cbc74c0c56adc68829..d5e2ebe0fe9eb12a834bef86cd673faa41369912 100644 --- a/source/RobotAPI/libraries/aron/core/io/dataIO/reader/navigator/NavigatorReader.cpp +++ b/source/RobotAPI/libraries/aron/core/io/dataIO/reader/navigator/NavigatorReader.cpp @@ -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 diff --git a/source/RobotAPI/libraries/aron/core/io/dataIO/writer/navigator/NavigatorWriter.cpp b/source/RobotAPI/libraries/aron/core/io/dataIO/writer/navigator/NavigatorWriter.cpp index 8777b5d0c9691d75a6dce7c780c4e3f6c5c6ce04..b1c25a788a0c1380ef2f8e0f4aa2d9f2acf967b6 100644 --- a/source/RobotAPI/libraries/aron/core/io/dataIO/writer/navigator/NavigatorWriter.cpp +++ b/source/RobotAPI/libraries/aron/core/io/dataIO/writer/navigator/NavigatorWriter.cpp @@ -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); } diff --git a/source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp b/source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp index eb1a486374c836d8156d8055e543379de9840a47..cf568cef484224a6b24e5d292cfa910dee0b8994 100644 --- a/source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp +++ b/source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp @@ -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