Browse Source

Adapted to Corrade changes.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
d51f29c57f
  1. 2
      src/Magnum/DefaultFramebuffer.cpp
  2. 2
      src/Magnum/Framebuffer.cpp
  3. 2
      src/Magnum/MeshTools/Interleave.h
  4. 2
      src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

2
src/Magnum/DefaultFramebuffer.cpp

@ -54,7 +54,7 @@ DefaultFramebuffer& DefaultFramebuffer::mapForDraw(std::initializer_list<std::pa
/* Create linear array from associative */
/** @todo C++14: use VLA to avoid heap allocation */
static_assert(GL_NONE == 0, "Expecting zero GL_NONE for zero-initialization");
auto _attachments = Containers::Array<GLenum>::zeroInitialized(max+1);
auto _attachments = Containers::Array<GLenum>{Containers::ValueInit, max+1};
for(const auto& attachment: attachments)
_attachments[attachment.first] = GLenum(attachment.second);

2
src/Magnum/Framebuffer.cpp

@ -160,7 +160,7 @@ Framebuffer& Framebuffer::mapForDraw(std::initializer_list<std::pair<UnsignedInt
/* Create linear array from associative */
/** @todo C++14: use VLA to avoid heap allocation */
static_assert(GL_NONE == 0, "Expecting zero GL_NONE for zero-initialization");
auto _attachments = Containers::Array<GLenum>::zeroInitialized(max+1);
Containers::Array<GLenum> _attachments{Containers::ValueInit, max+1};
for(const auto& attachment: attachments)
_attachments[attachment.first] = GLenum(attachment.second);

2
src/Magnum/MeshTools/Interleave.h

@ -141,7 +141,7 @@ template<class T, class ...U> typename std::enable_if<!std::is_same<T, Mesh>::va
/* Create output buffer only if we have some attributes */
if(attributeCount && attributeCount != ~std::size_t(0)) {
Containers::Array<char> data = Containers::Array<char>::zeroInitialized(attributeCount*stride);
Containers::Array<char> data{Containers::ValueInit, attributeCount*stride};
Implementation::writeInterleaved(stride, data.begin(), first, next...);
return data;

2
src/MagnumPlugins/TgaImageConverter/TgaImageConverter.cpp

@ -67,7 +67,7 @@ Containers::Array<char> TgaImageConverter::doExportToData(const ImageReference2D
/* Initialize data buffer */
const auto pixelSize = UnsignedByte(image.pixelSize());
auto data = Containers::Array<char>::zeroInitialized(sizeof(TgaHeader) + pixelSize*image.size().product());
Containers::Array<char> data{Containers::ValueInit, sizeof(TgaHeader) + pixelSize*image.size().product()};
/* Fill header */
auto header = reinterpret_cast<TgaHeader*>(data.begin());

Loading…
Cancel
Save