diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 01b8697de..6ac6c5152 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include @@ -259,8 +258,7 @@ const struct { } OpenMemoryData[]{ {"data", [](AbstractImporter& importer, Containers::ArrayView data) { /* Copy to ensure the original memory isn't referenced */ - Containers::Array copy{NoInit, data.size()}; - Utility::copy(Containers::arrayCast(data), copy); + Containers::Array copy{InPlaceInit, Containers::arrayCast(data)}; return importer.openData(copy); }}, {"memory", [](AbstractImporter& importer, Containers::ArrayView data) { diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index c21da6a95..31c4bade8 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp @@ -68,12 +68,10 @@ void TgaImporter::doOpenData(Containers::Array&& data, const DataFlags dat } /* Ttake over the existing array or copy the data if we can't */ - if(dataFlags & (DataFlag::Owned|DataFlag::ExternallyOwned)) { + if(dataFlags & (DataFlag::Owned|DataFlag::ExternallyOwned)) _in = Utility::move(data); - } else { - _in = Containers::Array{NoInit, data.size()}; - Utility::copy(data, _in); - } + else + _in = Containers::Array{InPlaceInit, data}; } UnsignedInt TgaImporter::doImage2DCount() const { return 1; } diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp index 20c5755b0..b8157f836 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.cpp @@ -27,7 +27,6 @@ #include "WavImporter.h" -#include #include #include #include @@ -223,8 +222,7 @@ void WavImporter::doOpenData(Containers::ArrayView data) { _frequency = formatChunk->sampleRate; /* Copy the data */ - _data = Containers::Array{NoInit, dataChunkSize}; - Utility::copy(Containers::arrayView(reinterpret_cast(dataChunk + 1), dataChunkSize), *_data); + _data = Containers::Array{InPlaceInit, Containers::arrayView(reinterpret_cast(dataChunk + 1), dataChunkSize)}; /* Fix the data endianness */ if(hasBigEndianData != Utility::Endianness::isBigEndian()) { @@ -245,9 +243,7 @@ BufferFormat WavImporter::doFormat() const { return _format; } UnsignedInt WavImporter::doFrequency() const { return _frequency; } Containers::Array WavImporter::doData() { - Containers::Array copy{NoInit, _data->size()}; - Utility::copy(*_data, copy); - return copy; + return Containers::Array{InPlaceInit, *_data}; } }}