From 8f311ad5fda946dcf7d39a58389009f88f853603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 5 Apr 2022 13:22:46 +0200 Subject: [PATCH] Adapt remaining code to not use deprecated Optional conversion. --- doc/snippets/MagnumShaderTools.cpp | 4 +- .../Test/AbstractConverterTest.cpp | 30 ++++--- src/Magnum/ShaderTools/shaderconverter.cpp | 16 +++- src/Magnum/Trade/AbstractImageConverter.cpp | 9 +- .../Trade/Test/AbstractImageConverterTest.cpp | 90 +++++++++++-------- .../Trade/Test/AbstractSceneConverterTest.cpp | 5 +- .../MagnumFontConverter.cpp | 5 +- .../Test/TgaImageConverterTest.cpp | 8 +- 8 files changed, 102 insertions(+), 65 deletions(-) diff --git a/doc/snippets/MagnumShaderTools.cpp b/doc/snippets/MagnumShaderTools.cpp index a5542a61f..3e0649f7c 100644 --- a/doc/snippets/MagnumShaderTools.cpp +++ b/doc/snippets/MagnumShaderTools.cpp @@ -94,8 +94,8 @@ void main() { converter->setDefinitions({ {"TEXTURED", ""} }); -Containers::Array spirv = converter->convertDataToData( - ShaderTools::Stage::Fragment, glsl); +Containers::Optional> spirv = + converter->convertDataToData(ShaderTools::Stage::Fragment, glsl); /* [AbstractConverter-usage-compilation] */ } diff --git a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp index 775177afa..787fa79ee 100644 --- a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp +++ b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp @@ -940,8 +940,9 @@ void AbstractConverterTest::convertDataToData() { } converter; const char data[] = {'S', 'P', 'I', 'R', 'V'}; - Containers::Array out = converter.convertDataToData({}, data); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + Containers::Optional> out = converter.convertDataToData({}, data); + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } @@ -1293,8 +1294,9 @@ void AbstractConverterTest::convertFileToData() { CORRADE_VERIFY(true); /* Capture correct function name first */ - Containers::Array out = converter.convertFileToData({}, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + Containers::Optional> out = converter.convertFileToData({}, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")); + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } @@ -1311,8 +1313,9 @@ void AbstractConverterTest::convertFileToDataAsData() { } } converter; - Containers::Array out = converter.convertFileToData({}, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + Containers::Optional> out = converter.convertFileToData({}, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")); + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } @@ -1420,11 +1423,12 @@ void AbstractConverterTest::linkDataToData() { CORRADE_VERIFY(true); /* so it picks up correct test case name */ - Containers::Array out = converter.linkDataToData({ + Containers::Optional> out = converter.linkDataToData({ {Stage::Vertex, Containers::arrayView({'V', 'E'})}, {Stage::Fragment, Containers::arrayView({'S', 'A'})} }); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } @@ -1933,11 +1937,12 @@ void AbstractConverterTest::linkFilesToData() { CORRADE_VERIFY(true); /* Capture correct function name first */ - Containers::Array out = converter.linkFilesToData({ + Containers::Optional> out = converter.linkFilesToData({ {Stage::Vertex, Utility::Path::join(SHADERTOOLS_TEST_DIR, "another.dat")}, {Stage::Fragment, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")} }); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } @@ -1960,11 +1965,12 @@ void AbstractConverterTest::linkFilesToDataAsData() { CORRADE_VERIFY(true); /* Capture correct function name first */ - Containers::Array out = converter.linkFilesToData({ + Containers::Optional> out = converter.linkFilesToData({ {Stage::Vertex, Utility::Path::join(SHADERTOOLS_TEST_DIR, "another.dat")}, {Stage::Fragment, Utility::Path::join(SHADERTOOLS_TEST_DIR, "file.dat")} }); - CORRADE_COMPARE_AS(out, Containers::arrayView({'V', 'S'}), + CORRADE_VERIFY(out); + CORRADE_COMPARE_AS(*out, Containers::arrayView({'V', 'S'}), TestSuite::Compare::Container); } diff --git a/src/Magnum/ShaderTools/shaderconverter.cpp b/src/Magnum/ShaderTools/shaderconverter.cpp index 4bc447793..005dd130a 100644 --- a/src/Magnum/ShaderTools/shaderconverter.cpp +++ b/src/Magnum/ShaderTools/shaderconverter.cpp @@ -487,7 +487,9 @@ see documentation of a particular converter for more information.)") return 18; /* same code as the same message below */ } - if(!(data = converter->convertFileToData(ShaderTools::Stage::Unspecified, args.arrayValue("input", 0)))) { + if(Containers::Optional> out = converter->convertFileToData(ShaderTools::Stage::Unspecified, args.arrayValue("input", 0))) { + data = *std::move(out); + } else { Error{} << "Cannot convert" << args.arrayValue("input", 0); return 20; /* same code as the same message below */ } @@ -569,14 +571,18 @@ see documentation of a particular converter for more information.)") /* Linking */ if(args.isSet("link")) { - if(!(data = converter->linkFilesToData(linkInputs))) { + if(Containers::Optional> out = converter->linkFilesToData(linkInputs)) { + data = *std::move(out); + } else { Error{} << "Cannot link" << args.arrayValue("input", 0) << "and others to" << args.value("output"); return 19; } /* Converting */ } else { - if(!(data = converter->convertFileToData(ShaderTools::Stage::Unspecified, args.arrayValue("input", 0)))) { + if(Containers::Optional> out = converter->convertFileToData(ShaderTools::Stage::Unspecified, args.arrayValue("input", 0))) { + data = *std::move(out); + } else { Error{} << "Cannot convert" << args.arrayValue("input", 0); return 20; } @@ -591,7 +597,9 @@ see documentation of a particular converter for more information.)") CORRADE_INTERNAL_ASSERT(data); /* Subsequent operations are always a conversion, not link */ - if(!(data = converter->convertDataToData(ShaderTools::Stage::Unspecified, data))) { + if(Containers::Optional> out = converter->convertDataToData(ShaderTools::Stage::Unspecified, data)) { + data = *std::move(out); + } else { Error{} << "Cannot convert shader data"; return 21; } diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp index 1a81b90a4..bfcc85b76 100644 --- a/src/Magnum/Trade/AbstractImageConverter.cpp +++ b/src/Magnum/Trade/AbstractImageConverter.cpp @@ -358,7 +358,8 @@ Containers::Optional> AbstractImageConverter::doConvertT #ifdef MAGNUM_BUILD_DEPRECATED Containers::Array AbstractImageConverter::exportToData(const ImageView2D& image) { - return convertToData(image); + Containers::Optional> out = convertToData(image); + return out ? *std::move(out) : nullptr; } #endif @@ -463,7 +464,8 @@ Containers::Optional> AbstractImageConverter::doConvertT #ifdef MAGNUM_BUILD_DEPRECATED Containers::Array AbstractImageConverter::exportToData(const CompressedImageView2D& image) { - return convertToData(image); + Containers::Optional> out = convertToData(image); + return out ? *std::move(out) : nullptr; } #endif @@ -520,7 +522,8 @@ AbstractImageConverter::convertToData(const ImageData2D& image) { #ifdef MAGNUM_BUILD_DEPRECATED Containers::Array AbstractImageConverter::exportToData(const ImageData2D& image) { - return convertToData(image); + Containers::Optional> out = convertToData(image); + return out ? *std::move(out) : nullptr; } #endif diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 2c76f0b8d..b8bb6c87e 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -993,8 +993,9 @@ void AbstractImageConverterTest::convert1DToData() { } converter; const char data[16]{}; - Containers::Array actual = converter.convertToData(ImageView1D{PixelFormat::RGBA8Unorm, 4, data}); - CORRADE_COMPARE(actual.size(), 4); + Containers::Optional> actual = converter.convertToData(ImageView1D{PixelFormat::RGBA8Unorm, 4, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 4); } void AbstractImageConverterTest::convert2DToData() { @@ -1006,8 +1007,9 @@ void AbstractImageConverterTest::convert2DToData() { } converter; const char data[96]{}; - Containers::Array actual = converter.convertToData(ImageView2D{PixelFormat::RGBA8Unorm, {4, 6}, data}); - CORRADE_COMPARE(actual.size(), 24); + Containers::Optional> actual = converter.convertToData(ImageView2D{PixelFormat::RGBA8Unorm, {4, 6}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 24); } void AbstractImageConverterTest::convert3DToData() { @@ -1019,8 +1021,9 @@ void AbstractImageConverterTest::convert3DToData() { } converter; const char data[192]{}; - Containers::Array actual = converter.convertToData(ImageView3D{PixelFormat::RGBA8Unorm, {4, 6, 2}, data}); - CORRADE_COMPARE(actual.size(), 48); + Containers::Optional> actual = converter.convertToData(ImageView3D{PixelFormat::RGBA8Unorm, {4, 6, 2}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 48); } void AbstractImageConverterTest::convert1DToDataInvalidImage() { @@ -1198,8 +1201,9 @@ void AbstractImageConverterTest::convertCompressed1DToData() { } converter; const char data[32]{}; - Containers::Array actual = converter.convertToData(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 16, data}); - CORRADE_COMPARE(actual.size(), 16); + Containers::Optional> actual = converter.convertToData(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 16, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 16); } void AbstractImageConverterTest::convertCompressed2DToData() { @@ -1211,8 +1215,9 @@ void AbstractImageConverterTest::convertCompressed2DToData() { } converter; const char data[64]{}; - Containers::Array actual = converter.convertToData(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8}, data}); - CORRADE_COMPARE(actual.size(), 128); + Containers::Optional> actual = converter.convertToData(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 128); } void AbstractImageConverterTest::convertCompressed3DToData() { @@ -1224,8 +1229,9 @@ void AbstractImageConverterTest::convertCompressed3DToData() { } converter; const char data[128]{}; - Containers::Array actual = converter.convertToData(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8, 2}, data}); - CORRADE_COMPARE(actual.size(), 256); + Containers::Optional> actual = converter.convertToData(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8, 2}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 256); } void AbstractImageConverterTest::convertCompressed1DToDataInvalidImage() { @@ -1491,13 +1497,14 @@ void AbstractImageConverterTest::convertLevels1DToData() { } converter; const char data[96]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ ImageView1D{PixelFormat::RGBA8Unorm, 4, data}, ImageView1D{PixelFormat::RGBA8Unorm, 2, data}, ImageView1D{PixelFormat::RGBA8Unorm, 3, data}, }); - CORRADE_COMPARE(actual.size(), 4*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 4*3); } void AbstractImageConverterTest::convertLevels2DToData() { @@ -1509,13 +1516,14 @@ void AbstractImageConverterTest::convertLevels2DToData() { } converter; const char data[96]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ ImageView2D{PixelFormat::RGBA8Unorm, {4, 6}, data}, ImageView2D{PixelFormat::RGBA8Unorm, {1, 3}, data}, ImageView2D{PixelFormat::RGBA8Unorm, {4, 2}, data} }); - CORRADE_COMPARE(actual.size(), 24*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 24*3); } void AbstractImageConverterTest::convertLevels3DToData() { @@ -1527,13 +1535,14 @@ void AbstractImageConverterTest::convertLevels3DToData() { } converter; const char data[192]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ ImageView3D{PixelFormat::RGBA8Unorm, {4, 6, 2}, data}, ImageView3D{PixelFormat::RGBA8Unorm, {2, 3, 5}, data}, ImageView3D{PixelFormat::RGBA8Unorm, {1, 1, 1}, data} }); - CORRADE_COMPARE(actual.size(), 48*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 48*3); } void AbstractImageConverterTest::convertLevels1DToDataInvalidImage() { @@ -1773,13 +1782,14 @@ void AbstractImageConverterTest::convertCompressedLevels1DToData() { } converter; const char data[32]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 16, data}, CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 4, data}, CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 12, data} }); - CORRADE_COMPARE(actual.size(), 16*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 16*3); } void AbstractImageConverterTest::convertCompressedLevels2DToData() { @@ -1791,13 +1801,14 @@ void AbstractImageConverterTest::convertCompressedLevels2DToData() { } converter; const char data[64]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8}, data}, CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 12}, data}, CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4}, data} }); - CORRADE_COMPARE(actual.size(), 128*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 128*3); } void AbstractImageConverterTest::convertCompressedLevels3DToData() { @@ -1809,13 +1820,14 @@ void AbstractImageConverterTest::convertCompressedLevels3DToData() { } converter; const char data[128]{}; - Containers::Array actual = converter.convertToData({ + Containers::Optional> actual = converter.convertToData({ /* Arbitrary dimensions should be fine */ CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8, 2}, data}, CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {4, 16, 1}, data}, CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 4, 1}, data} }); - CORRADE_COMPARE(actual.size(), 256*3); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 256*3); } void AbstractImageConverterTest::convertCompressedLevels1DToDataInvalidImage() { @@ -2035,8 +2047,9 @@ void AbstractImageConverterTest::convert1DToDataThroughLevels() { } converter; const char data[16]{}; - Containers::Array actual = converter.convertToData(ImageView1D{PixelFormat::RGBA8Unorm, 4, data}); - CORRADE_COMPARE(actual.size(), 4); + Containers::Optional> actual = converter.convertToData(ImageView1D{PixelFormat::RGBA8Unorm, 4, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 4); } void AbstractImageConverterTest::convert2DToDataThroughLevels() { @@ -2048,8 +2061,9 @@ void AbstractImageConverterTest::convert2DToDataThroughLevels() { } converter; const char data[96]{}; - Containers::Array actual = converter.convertToData(ImageView2D{PixelFormat::RGBA8Unorm, {4, 6}, data}); - CORRADE_COMPARE(actual.size(), 24); + Containers::Optional> actual = converter.convertToData(ImageView2D{PixelFormat::RGBA8Unorm, {4, 6}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 24); } void AbstractImageConverterTest::convert3DToDataThroughLevels() { @@ -2061,8 +2075,9 @@ void AbstractImageConverterTest::convert3DToDataThroughLevels() { } converter; const char data[192]{}; - Containers::Array actual = converter.convertToData(ImageView3D{PixelFormat::RGBA8Unorm, {4, 6, 2}, data}); - CORRADE_COMPARE(actual.size(), 48); + Containers::Optional> actual = converter.convertToData(ImageView3D{PixelFormat::RGBA8Unorm, {4, 6, 2}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 48); } void AbstractImageConverterTest::convertCompressed1DToDataThroughLevels() { @@ -2074,8 +2089,9 @@ void AbstractImageConverterTest::convertCompressed1DToDataThroughLevels() { } converter; const char data[32]{}; - Containers::Array actual = converter.convertToData(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 16, data}); - CORRADE_COMPARE(actual.size(), 16); + Containers::Optional> actual = converter.convertToData(CompressedImageView1D{CompressedPixelFormat::Bc1RGBAUnorm, 16, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 16); } void AbstractImageConverterTest::convertCompressed2DToDataThroughLevels() { @@ -2087,8 +2103,9 @@ void AbstractImageConverterTest::convertCompressed2DToDataThroughLevels() { } converter; const char data[64]{}; - Containers::Array actual = converter.convertToData(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8}, data}); - CORRADE_COMPARE(actual.size(), 128); + Containers::Optional> actual = converter.convertToData(CompressedImageView2D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 128); } void AbstractImageConverterTest::convertCompressed3DToDataThroughLevels() { @@ -2100,8 +2117,9 @@ void AbstractImageConverterTest::convertCompressed3DToDataThroughLevels() { } converter; const char data[128]{}; - Containers::Array actual = converter.convertToData(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8, 2}, data}); - CORRADE_COMPARE(actual.size(), 256); + Containers::Optional> actual = converter.convertToData(CompressedImageView3D{CompressedPixelFormat::Bc1RGBAUnorm, {16, 8, 2}, data}); + CORRADE_VERIFY(actual); + CORRADE_COMPARE(actual->size(), 256); } void AbstractImageConverterTest::convert1DToFile() { diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp index 2ea782fa0..093d149c4 100644 --- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp @@ -401,8 +401,9 @@ void AbstractSceneConverterTest::convertMeshToData() { } } converter; - Containers::Array data = converter.convertToData(MeshData{MeshPrimitive::Triangles, 6}); - CORRADE_COMPARE(data.size(), 6); + Containers::Optional> data = converter.convertToData(MeshData{MeshPrimitive::Triangles, 6}); + CORRADE_VERIFY(data); + CORRADE_COMPARE(data->size(), 6); } void AbstractSceneConverterTest::convertMeshToDataNotImplemented() { diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp index 6dbfe1809..bfa3b2257 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.cpp @@ -122,11 +122,12 @@ std::vector>> MagnumFontConverter std::copy(confStr.begin(), confStr.end(), confData.begin()); /* Save cache image */ - auto tgaData = Trade::TgaImageConverter().convertToData(cache.image()); + Containers::Optional> tgaData = Trade::TgaImageConverter().convertToData(cache.image()); + if(!tgaData) return {}; std::vector>> out; out.emplace_back(filename + ".conf", std::move(confData)); - out.emplace_back(filename + ".tga", std::move(tgaData)); + out.emplace_back(filename + ".tga", *std::move(tgaData)); return out; } diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index 1ccd75928..218ec21a8 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -130,7 +130,7 @@ void TgaImageConverterTest::rgb() { converter->setFlags(data.flags); std::ostringstream out; - Containers::Array array; + Containers::Optional> array; { Debug redirectOutput{&out}; array = converter->convertToData(OriginalRGB); @@ -141,7 +141,7 @@ void TgaImageConverterTest::rgb() { CORRADE_SKIP("TgaImporter plugin not enabled, can't test the result"); Containers::Pointer importer = _importerManager.instantiate("TgaImporter"); - CORRADE_VERIFY(importer->openData(array)); + CORRADE_VERIFY(importer->openData(*array)); Containers::Optional converted = importer->image2D(0); CORRADE_VERIFY(converted); @@ -161,7 +161,7 @@ void TgaImageConverterTest::rgba() { converter->setFlags(data.flags); std::ostringstream out; - Containers::Array array; + Containers::Optional> array; { Debug redirectOutput{&out}; array = converter->convertToData(OriginalRGBA); @@ -172,7 +172,7 @@ void TgaImageConverterTest::rgba() { CORRADE_SKIP("TgaImporter plugin not enabled, can't test the result"); Containers::Pointer importer = _importerManager.instantiate("TgaImporter"); - CORRADE_VERIFY(importer->openData(array)); + CORRADE_VERIFY(importer->openData(*array)); Containers::Optional converted = importer->image2D(0); CORRADE_VERIFY(converted);