From ca9ed0150b6967fe5ba6be2550a7d3ca7ee3f543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 29 Mar 2013 17:46:06 +0100 Subject: [PATCH] Adapted to Magnum changes. --- src/Plugins/TgaImporter/Test/TgaImporterTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp index a5045c3b2..1305d4cd2 100644 --- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp @@ -143,7 +143,7 @@ void TgaImporterTest::colorBits24() { #endif CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); - CORRADE_COMPARE(std::string(static_cast(image->data()), 2*3*3), std::string(pixels, 2*3*3)); + CORRADE_COMPARE(std::string(reinterpret_cast(image->data()), 2*3*3), std::string(pixels, 2*3*3)); delete image; } @@ -176,7 +176,7 @@ void TgaImporterTest::colorBits32() { #endif CORRADE_COMPARE(image->size(), Math::Vector2(2, 3)); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); - CORRADE_COMPARE(std::string(static_cast(image->data()), 2*3*3), std::string(pixels, 2*3*3)); + CORRADE_COMPARE(std::string(reinterpret_cast(image->data()), 2*3*3), std::string(pixels, 2*3*3)); delete image; } @@ -196,7 +196,7 @@ void TgaImporterTest::grayscaleBits8() { CORRADE_COMPARE(image->format(), Trade::ImageData2D::Format::Red); CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); - CORRADE_COMPARE(std::string(static_cast(image->data()), 2*3), std::string(data + 18, 2*3)); + CORRADE_COMPARE(std::string(reinterpret_cast(image->data()), 2*3), std::string(data + 18, 2*3)); } void TgaImporterTest::grayscaleBits16() {