diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp index 6fa6c1f09..19a84a681 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp @@ -26,6 +26,7 @@ #include "WavImporter.h" +#include #include #include #include @@ -221,9 +222,8 @@ void WavImporter::doOpenData(Containers::ArrayView data) { _frequency = formatChunk->sampleRate; /* Copy the data */ - const char* dataChunkPtr = reinterpret_cast(dataChunk + 1); - _data = Containers::Array(dataChunkSize); - std::copy(dataChunkPtr, dataChunkPtr+dataChunkSize, _data->begin()); + _data = Containers::Array{NoInit, dataChunkSize}; + Utility::copy(Containers::arrayView(reinterpret_cast(dataChunk + 1), dataChunkSize), *_data); /* Fix the data endianness */ if(hasBigEndianData != Utility::Endianness::isBigEndian()) { @@ -244,8 +244,8 @@ BufferFormat WavImporter::doFormat() const { return _format; } UnsignedInt WavImporter::doFrequency() const { return _frequency; } Containers::Array WavImporter::doData() { - Containers::Array copy(_data->size()); - std::copy(_data->begin(), _data->end(), copy.begin()); + Containers::Array copy{NoInit, _data->size()}; + Utility::copy(*_data, copy); return copy; }