diff --git a/src/Magnum/DebugTools/Test/BufferDataGLTest.cpp b/src/Magnum/DebugTools/Test/BufferDataGLTest.cpp index 235a3393d..80fcf6ff8 100644 --- a/src/Magnum/DebugTools/Test/BufferDataGLTest.cpp +++ b/src/Magnum/DebugTools/Test/BufferDataGLTest.cpp @@ -51,8 +51,7 @@ void BufferDataGLTest::data() { buffer.setData(Data, BufferUsage::StaticDraw); const Containers::Array contents = bufferData(buffer); MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(contents, - Containers::ArrayView{Data}, + CORRADE_COMPARE_AS(contents, Containers::arrayView(Data), TestSuite::Compare::Container); } @@ -61,8 +60,7 @@ void BufferDataGLTest::subData() { buffer.setData(Data, BufferUsage::StaticDraw); const Containers::Array contents = bufferSubData(buffer, 4, 3); MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(contents, - Containers::ArrayView{Data}.slice(1, 4), + CORRADE_COMPARE_AS(contents, Containers::arrayView(Data).slice(1, 4), TestSuite::Compare::Container); } diff --git a/src/Magnum/DebugTools/Test/TextureImageGLTest.cpp b/src/Magnum/DebugTools/Test/TextureImageGLTest.cpp index 79664a7bc..d00e5e51d 100644 --- a/src/Magnum/DebugTools/Test/TextureImageGLTest.cpp +++ b/src/Magnum/DebugTools/Test/TextureImageGLTest.cpp @@ -92,10 +92,8 @@ void TextureImageGLTest::subImage2D() { Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte}); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{Data2D}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(Data2D), TestSuite::Compare::Container); } #ifndef MAGNUM_TARGET_GLES2 @@ -107,8 +105,7 @@ void TextureImageGLTest::subImage2DBuffer() { Containers::Array data = bufferData(image.buffer()); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS(data, - Containers::ArrayView{Data2D}, + CORRADE_COMPARE_AS(data, Containers::arrayView(Data2D), TestSuite::Compare::Container); } #endif @@ -127,10 +124,8 @@ void TextureImageGLTest::subImageCube() { Image2D image = textureSubImage(texture, CubeMapCoordinate::PositiveX, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte}); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{Data2D}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(Data2D), TestSuite::Compare::Container); } #ifndef MAGNUM_TARGET_GLES2 @@ -149,8 +144,7 @@ void TextureImageGLTest::subImageCubeBuffer() { Containers::Array data = bufferData(image.buffer()); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS(data, - Containers::ArrayView{Data2D}, + CORRADE_COMPARE_AS(data, Containers::arrayView(Data2D), TestSuite::Compare::Container); } #endif @@ -170,9 +164,8 @@ void TextureImageGLTest::subImage2DUInt() { Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RedInteger, PixelType::UnsignedInt}); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()/4}), - Containers::ArrayView{Data2DUInt}, + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(Data2DUInt), TestSuite::Compare::Container); } @@ -191,9 +184,8 @@ void TextureImageGLTest::subImage2DFloat() { Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::Red, PixelType::Float}); MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()/4}), - Containers::ArrayView{Data2DFloat}, + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(Data2DFloat), TestSuite::Compare::Container); } #endif diff --git a/src/Magnum/Math/Test/FrustumTest.cpp b/src/Magnum/Math/Test/FrustumTest.cpp index 265041cf9..15a709951 100644 --- a/src/Magnum/Math/Test/FrustumTest.cpp +++ b/src/Magnum/Math/Test/FrustumTest.cpp @@ -115,7 +115,7 @@ void FrustumTest::construct() { planes[2], planes[3], planes[4], planes[5]}; - CORRADE_COMPARE_AS(frustum.planes(), Corrade::Containers::ArrayView(planes), + CORRADE_COMPARE_AS(frustum.planes(), Corrade::Containers::arrayView(planes), Corrade::TestSuite::Compare::Container); CORRADE_VERIFY((std::is_nothrow_constructible::value)); @@ -248,8 +248,8 @@ void FrustumTest::convert() { CORRADE_COMPARE(c, b); constexpr Frstm d(b); - CORRADE_COMPARE_AS(Corrade::Containers::ArrayView{d.data}, - (Corrade::Containers::ArrayView{a.data}), + CORRADE_COMPARE_AS(Corrade::Containers::arrayView(d.data), + Corrade::Containers::arrayView(a.data), Corrade::TestSuite::Compare::Container); /* Implicit conversion is not allowed */ diff --git a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp index 686818665..d00514c57 100644 --- a/src/Magnum/Test/AbstractShaderProgramGLTest.cpp +++ b/src/Magnum/Test/AbstractShaderProgramGLTest.cpp @@ -715,9 +715,8 @@ void AbstractShaderProgramGLTest::compute() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS( - (Corrade::Containers::ArrayView{reinterpret_cast(data.data()), 4}), - (Corrade::Containers::ArrayView{outData}), + CORRADE_COMPARE_AS(Containers::arrayCast(data), + Containers::arrayView(outData), TestSuite::Compare::Container); #endif } diff --git a/src/Magnum/Test/BufferGLTest.cpp b/src/Magnum/Test/BufferGLTest.cpp index 92f2eb2cb..ca86175b4 100644 --- a/src/Magnum/Test/BufferGLTest.cpp +++ b/src/Magnum/Test/BufferGLTest.cpp @@ -235,8 +235,7 @@ void BufferGLTest::data() { #ifndef MAGNUM_TARGET_GLES const Containers::Array contents = buffer.data(); MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(contents, - Containers::ArrayView{data}, + CORRADE_COMPARE_AS(contents, Containers::arrayView(data), TestSuite::Compare::Container); #endif @@ -262,8 +261,7 @@ void BufferGLTest::data() { #ifndef MAGNUM_TARGET_GLES const Containers::Array subContents = buffer.subData(4, 3); MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(subContents, - Containers::ArrayView{subData}, + CORRADE_COMPARE_AS(subContents, Containers::arrayView(subData), TestSuite::Compare::Container); #endif } @@ -411,8 +409,7 @@ void BufferGLTest::copy() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES const Containers::Array subContents = buffer2.subData(2, 3); - CORRADE_COMPARE_AS(subContents, - Containers::ArrayView{data}.slice(1, 4), + CORRADE_COMPARE_AS(subContents, Containers::arrayView(data).slice(1, 4), TestSuite::Compare::Container); #endif } diff --git a/src/Magnum/Test/BufferImageGLTest.cpp b/src/Magnum/Test/BufferImageGLTest.cpp index 455ffaf46..7a0a5e0f2 100644 --- a/src/Magnum/Test/BufferImageGLTest.cpp +++ b/src/Magnum/Test/BufferImageGLTest.cpp @@ -85,8 +85,8 @@ void BufferImageGLTest::construct() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data), + TestSuite::Compare::Container); #endif } @@ -114,8 +114,8 @@ void BufferImageGLTest::constructCompressed() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data), + TestSuite::Compare::Container); #endif } @@ -143,8 +143,8 @@ void BufferImageGLTest::constructBuffer() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data), + TestSuite::Compare::Container); #endif } @@ -178,8 +178,8 @@ void BufferImageGLTest::constructBufferCompressed() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data), + TestSuite::Compare::Container); #endif } @@ -299,8 +299,8 @@ void BufferImageGLTest::setData() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data2}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data2), + TestSuite::Compare::Container); #endif } @@ -330,8 +330,8 @@ void BufferImageGLTest::setDataCompressed() { /** @todo How to verify the contents in ES? */ #ifndef MAGNUM_TARGET_GLES - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{data2}, - TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(data2), + TestSuite::Compare::Container); #endif } diff --git a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp index 83ddc990f..1b17bc93f 100644 --- a/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureArrayGLTest.cpp @@ -465,9 +465,8 @@ void CubeMapTextureArrayGLTest::image() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset)), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); #endif } @@ -497,9 +496,8 @@ void CubeMapTextureArrayGLTest::compressedImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset)), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset), + Containers::arrayView(CompressedData), TestSuite::Compare::Container); #endif } @@ -526,8 +524,8 @@ void CubeMapTextureArrayGLTest::imageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); - CORRADE_COMPARE_AS(imageData.suffix(DataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(DataOffset), Containers::arrayView(Data), + TestSuite::Compare::Container); #endif } @@ -560,7 +558,7 @@ void CubeMapTextureArrayGLTest::compressedImageBuffer() { CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + Containers::arrayView(CompressedData), TestSuite::Compare::Container); #endif } @@ -717,9 +715,8 @@ void CubeMapTextureArrayGLTest::subImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubDataComplete), TestSuite::Compare::Container); #endif } @@ -751,9 +748,9 @@ void CubeMapTextureArrayGLTest::compressedSubImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); } #endif @@ -779,9 +776,9 @@ void CubeMapTextureArrayGLTest::compressedSubImage() { CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images"); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); } #endif } @@ -811,7 +808,8 @@ void CubeMapTextureArrayGLTest::subImageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete), + TestSuite::Compare::Container); #endif } @@ -845,7 +843,8 @@ void CubeMapTextureArrayGLTest::compressedSubImageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6})); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); #endif } @@ -868,9 +867,8 @@ void CubeMapTextureArrayGLTest::subImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(SubDataOffset)), - Containers::ArrayView{SubData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(SubDataOffset), + Containers::arrayView(SubData), TestSuite::Compare::Container); } void CubeMapTextureArrayGLTest::compressedSubImageQuery() { @@ -895,9 +893,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData), + TestSuite::Compare::Container); } CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage}); @@ -905,9 +903,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedSubDataOffset)), - Containers::ArrayView{CompressedSubData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedSubDataOffset), + Containers::arrayView(CompressedSubData), + TestSuite::Compare::Container); } void CubeMapTextureArrayGLTest::subImageQueryBuffer() { @@ -930,7 +928,7 @@ void CubeMapTextureArrayGLTest::subImageQueryBuffer() { CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4)); CORRADE_COMPARE_AS(imageData.suffix(SubDataOffset), - Containers::ArrayView{SubData}, TestSuite::Compare::Container); + Containers::arrayView(SubData), TestSuite::Compare::Container); } void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() { @@ -956,7 +954,8 @@ void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{4}); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData), + TestSuite::Compare::Container); } CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage}, BufferUsage::StaticRead); @@ -965,7 +964,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{4}); - CORRADE_COMPARE_AS(imageData.suffix(_compressedSubDataOffset), Containers::ArrayView{CompressedSubData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_compressedSubDataOffset), + Containers::arrayView(CompressedSubData), + TestSuite::Compare::Container); } #endif diff --git a/src/Magnum/Test/CubeMapTextureGLTest.cpp b/src/Magnum/Test/CubeMapTextureGLTest.cpp index 820edb866..5a2d0496c 100644 --- a/src/Magnum/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/Test/CubeMapTextureGLTest.cpp @@ -483,9 +483,8 @@ void CubeMapTextureGLTest::image() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(2)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_dataOffset)), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); #endif } @@ -520,9 +519,8 @@ void CubeMapTextureGLTest::compressedImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}).suffix(_compressedDataOffset), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset), + Containers::arrayView(CompressedData), TestSuite::Compare::Container); #endif } @@ -544,7 +542,7 @@ void CubeMapTextureGLTest::imageBuffer() { CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + Containers::arrayView(Data), TestSuite::Compare::Container); #endif } @@ -582,7 +580,7 @@ void CubeMapTextureGLTest::compressedImageBuffer() { CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + Containers::arrayView(CompressedData), TestSuite::Compare::Container); #endif } #endif @@ -628,9 +626,8 @@ void CubeMapTextureGLTest::immutableCompressedImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData), TestSuite::Compare::Container); #endif } @@ -704,9 +701,8 @@ void CubeMapTextureGLTest::fullImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(FullDataOffset)), - Containers::ArrayView{FullData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(FullDataOffset), + Containers::arrayView(FullData), TestSuite::Compare::Container); } void CubeMapTextureGLTest::compressedFullImageQuery() { @@ -726,9 +722,8 @@ void CubeMapTextureGLTest::compressedFullImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()).suffix(_compressedFullDataOffset), - Containers::ArrayView{CompressedFullData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedFullDataOffset), + Containers::arrayView(CompressedFullData), TestSuite::Compare::Container); } void CubeMapTextureGLTest::fullImageQueryBuffer() { @@ -749,7 +744,7 @@ void CubeMapTextureGLTest::fullImageQueryBuffer() { CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); const auto imageData = image.buffer().data(); CORRADE_COMPARE_AS(imageData.suffix(FullDataOffset), - Containers::ArrayView{FullData}, TestSuite::Compare::Container); + Containers::arrayView(FullData), TestSuite::Compare::Container); } void CubeMapTextureGLTest::compressedFullImageQueryBuffer() { @@ -771,7 +766,7 @@ void CubeMapTextureGLTest::compressedFullImageQueryBuffer() { CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); const auto imageData = image.buffer().data(); CORRADE_COMPARE_AS(imageData.suffix(_compressedFullDataOffset), - Containers::ArrayView{CompressedFullData}, TestSuite::Compare::Container); + Containers::arrayView(CompressedFullData), TestSuite::Compare::Container); } #endif @@ -839,9 +834,8 @@ void CubeMapTextureGLTest::subImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubDataComplete), TestSuite::Compare::Container); #endif } @@ -882,9 +876,9 @@ void CubeMapTextureGLTest::compressedSubImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{12}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); } #endif @@ -920,9 +914,9 @@ void CubeMapTextureGLTest::compressedSubImage() { CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported() && Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images when using ARB_direct_state_access"); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); } #endif } @@ -955,7 +949,8 @@ void CubeMapTextureGLTest::subImageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete), + TestSuite::Compare::Container); #endif } @@ -997,7 +992,8 @@ void CubeMapTextureGLTest::compressedSubImageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{12}); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubDataComplete), + TestSuite::Compare::Container); #endif } #endif @@ -1022,9 +1018,8 @@ void CubeMapTextureGLTest::subImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}).suffix(_dataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); } void CubeMapTextureGLTest::compressedSubImageQuery() { @@ -1050,9 +1045,9 @@ void CubeMapTextureGLTest::compressedSubImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData), + TestSuite::Compare::Container); } CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage}); @@ -1060,9 +1055,8 @@ void CubeMapTextureGLTest::compressedSubImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset)), - Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset), + Containers::arrayView(CompressedData), TestSuite::Compare::Container); } void CubeMapTextureGLTest::subImageQueryBuffer() { @@ -1085,7 +1079,8 @@ void CubeMapTextureGLTest::subImageQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1)); - CORRADE_COMPARE_AS(imageData.suffix(_dataOffset), Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_dataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); } void CubeMapTextureGLTest::compressedSubImageQueryBuffer() { @@ -1112,7 +1107,8 @@ void CubeMapTextureGLTest::compressedSubImageQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData), + TestSuite::Compare::Container); } CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage}, BufferUsage::StaticRead); @@ -1121,7 +1117,8 @@ void CubeMapTextureGLTest::compressedSubImageQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); - CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), Containers::ArrayView{CompressedData}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), + Containers::arrayView(CompressedData), TestSuite::Compare::Container); } #endif diff --git a/src/Magnum/Test/PixelStorageGLTest.cpp b/src/Magnum/Test/PixelStorageGLTest.cpp index 547bface2..9c2423fe5 100644 --- a/src/Magnum/Test/PixelStorageGLTest.cpp +++ b/src/Magnum/Test/PixelStorageGLTest.cpp @@ -136,7 +136,7 @@ void PixelStorageGLTest::unpack2D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(actual.data(), Containers::ArrayView{ActualData}, + CORRADE_COMPARE_AS(actual.data(), Containers::arrayView(ActualData), TestSuite::Compare::Container); } @@ -171,7 +171,7 @@ void PixelStorageGLTest::pack2D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(image.data(), Containers::ArrayView{Data2D}, + CORRADE_COMPARE_AS(image.data(), Containers::arrayView(Data2D), TestSuite::Compare::Container); } @@ -228,10 +228,10 @@ void PixelStorageGLTest::unpack3D() { /* Clear padding in the last row (the driver might leave them untouched, confirmed on NVidia 358.16) */ - CORRADE_VERIFY(actual.data().size() == Containers::ArrayView{ActualData}.size()); + CORRADE_VERIFY(actual.data().size() == Containers::arrayView(ActualData).size()); *(actual.data().end() - 1) = *(actual.data().end() - 2) = 0; - CORRADE_COMPARE_AS(actual.data(), Containers::ArrayView{ActualData}, + CORRADE_COMPARE_AS(actual.data(), Containers::arrayView(ActualData), TestSuite::Compare::Container); #endif } @@ -259,7 +259,7 @@ void PixelStorageGLTest::pack3D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS(image.data(), Containers::ArrayView{Data3D}, + CORRADE_COMPARE_AS(image.data(), Containers::arrayView(Data3D), TestSuite::Compare::Container); } #endif @@ -311,8 +311,8 @@ void PixelStorageGLTest::unpackCompressed2D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS((Containers::ArrayView{actual.data(), actual.data().size()}), - Containers::ArrayView{ActualCompressedData}, + CORRADE_COMPARE_AS(Containers::arrayCast(actual.data()), + Containers::arrayView(ActualCompressedData), TestSuite::Compare::Container); } @@ -339,8 +339,8 @@ void PixelStorageGLTest::packCompressed2D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS((Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData2D}, + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData2D), TestSuite::Compare::Container); } @@ -420,8 +420,8 @@ void PixelStorageGLTest::unpackCompressed3D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS((Containers::ArrayView{actual.data(), actual.data().size()}), - Containers::ArrayView{ActualCompressedData}, + CORRADE_COMPARE_AS(Containers::arrayCast(actual.data()), + Containers::arrayView(ActualCompressedData), TestSuite::Compare::Container); } @@ -449,8 +449,8 @@ void PixelStorageGLTest::packCompressed3D() { MAGNUM_VERIFY_NO_ERROR(); - CORRADE_COMPARE_AS((Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData3D}, + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData3D), TestSuite::Compare::Container); } #endif diff --git a/src/Magnum/Test/RectangleTextureGLTest.cpp b/src/Magnum/Test/RectangleTextureGLTest.cpp index 0834fcc67..c4f7125fe 100644 --- a/src/Magnum/Test/RectangleTextureGLTest.cpp +++ b/src/Magnum/Test/RectangleTextureGLTest.cpp @@ -301,9 +301,8 @@ void RectangleTextureGLTest::image() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(2)); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()).suffix(DataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedImage() { @@ -327,7 +326,7 @@ void RectangleTextureGLTest::imageBuffer() { CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE_AS(imageData.suffix(DataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + Containers::arrayView(Data), TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedImageBuffer() { @@ -362,9 +361,8 @@ void RectangleTextureGLTest::subImage() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()), - Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubDataComplete), TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedSubImage() { @@ -389,7 +387,8 @@ void RectangleTextureGLTest::subImageBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubDataComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete), + TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedSubImageBuffer() { @@ -414,9 +413,8 @@ void RectangleTextureGLTest::subImageQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()).suffix(DataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset), + Containers::arrayView(Data), TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedSubImageQuery() { @@ -443,7 +441,7 @@ void RectangleTextureGLTest::subImageQueryBuffer() { CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE_AS(imageData.suffix(DataOffset), - Containers::ArrayView{Data}, TestSuite::Compare::Container); + Containers::arrayView(Data), TestSuite::Compare::Container); } void RectangleTextureGLTest::compressedSubImageQueryBuffer() { diff --git a/src/Magnum/Test/TextureArrayGLTest.cpp b/src/Magnum/Test/TextureArrayGLTest.cpp index 749081d43..738f0277b 100644 --- a/src/Magnum/Test/TextureArrayGLTest.cpp +++ b/src/Magnum/Test/TextureArrayGLTest.cpp @@ -769,9 +769,8 @@ void TextureArrayGLTest::image1D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(2)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset1D)), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset1D), + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedImage1D() { @@ -796,7 +795,7 @@ void TextureArrayGLTest::image1DBuffer() { CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedImage1DBuffer() { @@ -845,9 +844,8 @@ void TextureArrayGLTest::image2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset2D)), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset2D), + Containers::arrayView(Data2D), TestSuite::Compare::Container); #endif } @@ -879,9 +877,9 @@ void TextureArrayGLTest::compressedImage2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset2D)), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); #endif } @@ -906,7 +904,7 @@ void TextureArrayGLTest::image2DBuffer() { CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + Containers::arrayView(Data2D), TestSuite::Compare::Container); #endif } @@ -940,7 +938,8 @@ void TextureArrayGLTest::compressedImage2DBuffer() { CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); #endif } @@ -972,9 +971,8 @@ void TextureArrayGLTest::subImage1D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{SubData1DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubData1DComplete), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage1D() { @@ -999,7 +997,8 @@ void TextureArrayGLTest::subImage1DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubData1DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData1DComplete), + TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage1DBuffer() { @@ -1024,8 +1023,8 @@ void TextureArrayGLTest::subImage1DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset1D)), Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset1D), + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage1DQuery() { @@ -1052,7 +1051,7 @@ void TextureArrayGLTest::subImage1DQueryBuffer() { CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage1DQueryBuffer() { @@ -1141,8 +1140,9 @@ void TextureArrayGLTest::subImage2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), Containers::ArrayView{SubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubData2DComplete), + TestSuite::Compare::Container); #endif } @@ -1176,8 +1176,9 @@ void TextureArrayGLTest::compressedSubImage2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4})); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()), Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); } #endif @@ -1203,8 +1204,9 @@ void TextureArrayGLTest::compressedSubImage2D() { CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Non-default compressed pixel storage for array textures behaves weirdly on NVidia"); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()), Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); } #endif } @@ -1231,7 +1233,8 @@ void TextureArrayGLTest::subImage2DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData2DComplete), + TestSuite::Compare::Container); #endif } @@ -1266,7 +1269,8 @@ void TextureArrayGLTest::compressedSubImage2DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4})); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); } #endif @@ -1293,7 +1297,8 @@ void TextureArrayGLTest::compressedSubImage2DBuffer() { CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Non-default compressed pixel storage for array textures behaves weirdly on NVidia"); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); } #endif } @@ -1317,8 +1322,8 @@ void TextureArrayGLTest::subImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset2D)), Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset2D), + Containers::arrayView(Data2D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage2DQuery() { @@ -1344,9 +1349,9 @@ void TextureArrayGLTest::compressedSubImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 1}, {4, 4, 2}), {_compressedDataStorage2D}); @@ -1354,9 +1359,9 @@ void TextureArrayGLTest::compressedSubImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset2D)), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } void TextureArrayGLTest::subImage2DQueryBuffer() { @@ -1379,7 +1384,7 @@ void TextureArrayGLTest::subImage2DQueryBuffer() { CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + Containers::arrayView(Data2D), TestSuite::Compare::Container); } void TextureArrayGLTest::compressedSubImage2DQueryBuffer() { @@ -1409,7 +1414,9 @@ void TextureArrayGLTest::compressedSubImage2DQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); - CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } void TextureArrayGLTest::generateMipmap1D() { diff --git a/src/Magnum/Test/TextureGLTest.cpp b/src/Magnum/Test/TextureGLTest.cpp index ef7e808fb..9faf98d53 100644 --- a/src/Magnum/Test/TextureGLTest.cpp +++ b/src/Magnum/Test/TextureGLTest.cpp @@ -1053,9 +1053,8 @@ void TextureGLTest::image1D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), 2); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset1D)), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset1D), + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureGLTest::compressedImage1D() { @@ -1077,7 +1076,7 @@ void TextureGLTest::image1DBuffer() { CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureGLTest::compressedImage1DBuffer() { @@ -1112,9 +1111,8 @@ void TextureGLTest::image2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(2)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_dataOffset2D)), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset2D), + Containers::arrayView(Data2D), TestSuite::Compare::Container); #endif } @@ -1143,9 +1141,9 @@ void TextureGLTest::compressedImage2D() { CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset2D)), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); #endif } @@ -1167,7 +1165,7 @@ void TextureGLTest::image2DBuffer() { CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + Containers::arrayView(Data2D), TestSuite::Compare::Container); #endif } @@ -1197,7 +1195,8 @@ void TextureGLTest::compressedImage2DBuffer() { CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); #endif } #endif @@ -1246,9 +1245,8 @@ void TextureGLTest::image3D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(2)); - CORRADE_COMPARE_AS( - Containers::ArrayView(image.data(), image.data().size()).suffix(_dataOffset3D), - Containers::ArrayView{Data3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset3D), + Containers::arrayView(Data3D), TestSuite::Compare::Container); #endif } @@ -1271,9 +1269,9 @@ void TextureGLTest::compressedImage3D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset3D)), - Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset3D), + Containers::arrayView(CompressedData3D), + TestSuite::Compare::Container); #endif } @@ -1295,7 +1293,7 @@ void TextureGLTest::image3DBuffer() { CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D), - Containers::ArrayView{Data3D}, TestSuite::Compare::Container); + Containers::arrayView(Data3D), TestSuite::Compare::Container); #endif } @@ -1320,7 +1318,8 @@ void TextureGLTest::compressedImage3DBuffer() { CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D), - Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + Containers::arrayView(CompressedData3D), + TestSuite::Compare::Container); #endif } #endif @@ -1347,9 +1346,9 @@ void TextureGLTest::subImage1D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), 4); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset1D)), - Containers::ArrayView{SubData1DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset1D), + Containers::arrayView(SubData1DComplete), + TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage1D() { @@ -1372,7 +1371,8 @@ void TextureGLTest::subImage1DBuffer() { CORRADE_COMPARE(image.size(), 4); CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), - Containers::ArrayView{SubData1DComplete}, TestSuite::Compare::Container); + Containers::arrayView(SubData1DComplete), + TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage1DBuffer() { @@ -1395,8 +1395,8 @@ void TextureGLTest::subImage1DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), 2); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(DataOffset1D)), Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(DataOffset1D), + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage1DQuery() { @@ -1421,7 +1421,7 @@ void TextureGLTest::subImage1DQueryBuffer() { CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), - Containers::ArrayView{Data1D}, TestSuite::Compare::Container); + Containers::arrayView(Data1D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage1DQueryBuffer() { @@ -1469,9 +1469,9 @@ void TextureGLTest::subImage2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{SubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubData2DComplete), + TestSuite::Compare::Container); #endif } @@ -1501,9 +1501,9 @@ void TextureGLTest::compressedSubImage2D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector2i{12, 4})); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); #endif } @@ -1525,7 +1525,8 @@ void TextureGLTest::subImage2DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData2DComplete), + TestSuite::Compare::Container); #endif } @@ -1556,7 +1557,8 @@ void TextureGLTest::compressedSubImage2DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), (Vector2i{12, 4})); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubData2DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete), + TestSuite::Compare::Container); #endif } #endif @@ -1578,8 +1580,8 @@ void TextureGLTest::subImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_dataOffset2D)), Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset2D), + Containers::arrayView(Data2D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage2DQuery() { @@ -1602,9 +1604,9 @@ void TextureGLTest::compressedSubImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } CompressedImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D}); @@ -1612,9 +1614,9 @@ void TextureGLTest::compressedSubImage2DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset2D)), - Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } void TextureGLTest::subImage2DQueryBuffer() { @@ -1635,7 +1637,7 @@ void TextureGLTest::subImage2DQueryBuffer() { CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D), - Containers::ArrayView{Data2D}, TestSuite::Compare::Container); + Containers::arrayView(Data2D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage2DQueryBuffer() { @@ -1659,7 +1661,8 @@ void TextureGLTest::compressedSubImage2DQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } CompressedBufferImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D}, BufferUsage::StaticRead); @@ -1668,7 +1671,9 @@ void TextureGLTest::compressedSubImage2DQueryBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector2i{4}); - CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), Containers::ArrayView{CompressedData2D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), + Containers::arrayView(CompressedData2D), + TestSuite::Compare::Container); } #endif @@ -1763,9 +1768,9 @@ void TextureGLTest::subImage3D() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4)); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{SubData3DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(SubData3DComplete), + TestSuite::Compare::Container); #endif } @@ -1795,9 +1800,9 @@ void TextureGLTest::compressedSubImage3D() { CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedSubData3DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedSubData3DComplete), + TestSuite::Compare::Container); } #endif } @@ -1820,7 +1825,8 @@ void TextureGLTest::subImage3DBuffer() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i(4)); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{SubData3DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData3DComplete), + TestSuite::Compare::Container); #endif } @@ -1851,7 +1857,9 @@ void TextureGLTest::compressedSubImage3DBuffer() { CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedSubData3DComplete}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, + Containers::arrayView(CompressedSubData3DComplete), + TestSuite::Compare::Container); } #endif } @@ -1874,8 +1882,8 @@ void TextureGLTest::subImage3DQuery() { MAGNUM_VERIFY_NO_ERROR(); CORRADE_COMPARE(image.size(), Vector3i{2}); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_dataOffset3D)), Containers::ArrayView{Data3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_dataOffset3D), + Containers::arrayView(Data3D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage3DQuery() { @@ -1902,9 +1910,9 @@ void TextureGLTest::compressedSubImage3DQuery() { CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}), - Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()), + Containers::arrayView(CompressedData3D), + TestSuite::Compare::Container); } CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D}); @@ -1917,9 +1925,8 @@ void TextureGLTest::compressedSubImage3DQuery() { CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS( - (Containers::ArrayView{image.data(), image.data().size()}.suffix(_compressedDataOffset3D)), - Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(Containers::arrayCast(image.data()).suffix(_compressedDataOffset3D), + Containers::arrayView(CompressedData3D), TestSuite::Compare::Container); } } @@ -1941,7 +1948,7 @@ void TextureGLTest::subImage3DQueryBuffer() { CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D), - Containers::ArrayView{Data3D}, TestSuite::Compare::Container); + Containers::arrayView(Data3D), TestSuite::Compare::Container); } void TextureGLTest::compressedSubImage3DQueryBuffer() { @@ -1969,7 +1976,8 @@ void TextureGLTest::compressedSubImage3DQueryBuffer() { CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS(imageData, Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData3D), + TestSuite::Compare::Container); } CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D}, BufferUsage::StaticRead); @@ -1983,7 +1991,9 @@ void TextureGLTest::compressedSubImage3DQueryBuffer() { CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); - CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D), Containers::ArrayView{CompressedData3D}, TestSuite::Compare::Container); + CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D), + Containers::arrayView(CompressedData3D), + TestSuite::Compare::Container); } } diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 74c9f2539..b9f303138 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -133,7 +133,7 @@ void TgaImageConverterTest::rgb() { CORRADE_COMPARE(converted->size(), Vector2i(2, 3)); CORRADE_COMPARE(converted->format(), PixelFormat::RGB); CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte); - CORRADE_COMPARE_AS(converted->data(), Containers::ArrayView{ConvertedDataRGB}, + CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(ConvertedDataRGB), TestSuite::Compare::Container); } @@ -149,7 +149,7 @@ void TgaImageConverterTest::rgba() { CORRADE_COMPARE(converted->size(), Vector2i(2, 3)); CORRADE_COMPARE(converted->format(), PixelFormat::RGBA); CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte); - CORRADE_COMPARE_AS(converted->data(), Containers::ArrayView{OriginalDataRGBA}, + CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(OriginalDataRGBA), TestSuite::Compare::Container); } diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 5081e9f7c..9de369823 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -135,7 +135,7 @@ void TgaImporterTest::colorBits24() { CORRADE_COMPARE(image->format(), PixelFormat::RGB); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); - CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{pixels}, + CORRADE_COMPARE_AS(image->data(), Containers::arrayView(pixels), TestSuite::Compare::Container); } @@ -160,7 +160,7 @@ void TgaImporterTest::colorBits32() { CORRADE_COMPARE(image->format(), PixelFormat::RGBA); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); - CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{pixels}, + CORRADE_COMPARE_AS(image->data(), Containers::arrayView(pixels), TestSuite::Compare::Container); } @@ -184,7 +184,7 @@ void TgaImporterTest::grayscaleBits8() { #endif CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); - CORRADE_COMPARE_AS(image->data(), Containers::ArrayView{data}.suffix(18), + CORRADE_COMPARE_AS(image->data(), Containers::arrayView(data).suffix(18), TestSuite::Compare::Container); }