From d51f29c57f19965283f82ce5eb71541338f8a339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 20 Jun 2015 22:32:38 +0200 Subject: [PATCH] Adapted to Corrade changes. --- src/Magnum/DefaultFramebuffer.cpp | 2 +- src/Magnum/Framebuffer.cpp | 2 +- src/Magnum/MeshTools/Interleave.h | 2 +- src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/DefaultFramebuffer.cpp b/src/Magnum/DefaultFramebuffer.cpp index b636a7b65..ae12dc9d5 100644 --- a/src/Magnum/DefaultFramebuffer.cpp +++ b/src/Magnum/DefaultFramebuffer.cpp @@ -54,7 +54,7 @@ DefaultFramebuffer& DefaultFramebuffer::mapForDraw(std::initializer_list::zeroInitialized(max+1); + auto _attachments = Containers::Array{Containers::ValueInit, max+1}; for(const auto& attachment: attachments) _attachments[attachment.first] = GLenum(attachment.second); diff --git a/src/Magnum/Framebuffer.cpp b/src/Magnum/Framebuffer.cpp index 10ff1246a..44a5e6e26 100644 --- a/src/Magnum/Framebuffer.cpp +++ b/src/Magnum/Framebuffer.cpp @@ -160,7 +160,7 @@ Framebuffer& Framebuffer::mapForDraw(std::initializer_list::zeroInitialized(max+1); + Containers::Array _attachments{Containers::ValueInit, max+1}; for(const auto& attachment: attachments) _attachments[attachment.first] = GLenum(attachment.second); diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h index 49a493889..0d9e51115 100644 --- a/src/Magnum/MeshTools/Interleave.h +++ b/src/Magnum/MeshTools/Interleave.h @@ -141,7 +141,7 @@ template typename std::enable_if::va /* Create output buffer only if we have some attributes */ if(attributeCount && attributeCount != ~std::size_t(0)) { - Containers::Array data = Containers::Array::zeroInitialized(attributeCount*stride); + Containers::Array data{Containers::ValueInit, attributeCount*stride}; Implementation::writeInterleaved(stride, data.begin(), first, next...); return data; diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp index a62fff7f8..43b06a92e 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp @@ -67,7 +67,7 @@ Containers::Array TgaImageConverter::doExportToData(const ImageReference2D /* Initialize data buffer */ const auto pixelSize = UnsignedByte(image.pixelSize()); - auto data = Containers::Array::zeroInitialized(sizeof(TgaHeader) + pixelSize*image.size().product()); + Containers::Array data{Containers::ValueInit, sizeof(TgaHeader) + pixelSize*image.size().product()}; /* Fill header */ auto header = reinterpret_cast(data.begin());