Browse Source

Don't use the deprecated DefaultInit Array constructors.

pull/680/head
Vladimír Vondruš 11 months ago
parent
commit
b02cab2f32
  1. 4
      src/Magnum/MaterialTools/Copy.cpp
  2. 4
      src/Magnum/MeshTools/Copy.cpp
  3. 4
      src/Magnum/SceneTools/Copy.cpp
  4. 2
      src/Magnum/Trade/PhongMaterialData.cpp

4
src/Magnum/MaterialTools/Copy.cpp

@ -46,9 +46,9 @@ Trade::MaterialData copy(Trade::MaterialData&& material) {
if(material.attributeDataFlags() >= (Trade::DataFlag::Mutable|Trade::DataFlag::Owned)) if(material.attributeDataFlags() >= (Trade::DataFlag::Mutable|Trade::DataFlag::Owned))
attributes = material.releaseAttributeData(); attributes = material.releaseAttributeData();
else { else {
/* DefaultInit so we don't use a non-default deleter which could cause /* ValueInit so we don't use a non-default deleter which could cause
problems in plugins */ problems in plugins */
attributes = Containers::Array<Trade::MaterialAttributeData>{DefaultInit, material.attributeData().size()}; attributes = Containers::Array<Trade::MaterialAttributeData>{ValueInit, material.attributeData().size()};
Utility::copy(material.attributeData(), attributes); Utility::copy(material.attributeData(), attributes);
} }

4
src/Magnum/MeshTools/Copy.cpp

@ -141,9 +141,9 @@ Trade::MeshData copy(Trade::MeshData&& mesh) {
a default deleter, but would need to pay attention to not copy items a default deleter, but would need to pay attention to not copy items
to themselves and such */ to themselves and such */
} else { } else {
/* Using DefaultInit so the array has a default deleter and isn't /* Using ValueInit so the array has a default deleter and isn't
problematic to use in plugins */ problematic to use in plugins */
attributeData = Containers::Array<Trade::MeshAttributeData>{DefaultInit, originalAttributeData.size()}; attributeData = Containers::Array<Trade::MeshAttributeData>{ValueInit, originalAttributeData.size()};
for(std::size_t i = 0; i != originalAttributeData.size(); ++i) { for(std::size_t i = 0; i != originalAttributeData.size(); ++i) {
const Trade::MeshAttributeData& originalAttribute = originalAttributeData[i]; const Trade::MeshAttributeData& originalAttribute = originalAttributeData[i];

4
src/Magnum/SceneTools/Copy.cpp

@ -83,9 +83,9 @@ Trade::SceneData copy(Trade::SceneData&& scene) {
a default deleter, but would need to pay attention to not copy items a default deleter, but would need to pay attention to not copy items
to themselves and such */ to themselves and such */
} else { } else {
/* Using DefaultInit so the array has a default deleter and isn't /* Using ValueInit so the array has a default deleter and isn't
problematic to use in plugins */ problematic to use in plugins */
fieldData = Containers::Array<Trade::SceneFieldData>{DefaultInit, originalFieldData.size()}; fieldData = Containers::Array<Trade::SceneFieldData>{ValueInit, originalFieldData.size()};
for(std::size_t i = 0; i != originalFieldData.size(); ++i) { for(std::size_t i = 0; i != originalFieldData.size(); ++i) {
const Trade::SceneFieldData& originalField = originalFieldData[i]; const Trade::SceneFieldData& originalField = originalFieldData[i];

2
src/Magnum/Trade/PhongMaterialData.cpp

@ -94,7 +94,7 @@ PhongMaterialData::PhongMaterialData(const Flags flags, const Color4& ambientCol
/* Convert back to a non-growable Array as importers don't allow custom /* Convert back to a non-growable Array as importers don't allow custom
deleters in plugin implementations */ deleters in plugin implementations */
arrayShrink(data, DefaultInit); arrayShrink(data, ValueInit);
return data; return data;
}(), importerState} { }(), importerState} {
/* The data can't be filled here because it won't be sorted correctly */ /* The data can't be filled here because it won't be sorted correctly */

Loading…
Cancel
Save