ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Adapted to Magnum changes.

pull/34/head
Vladimír Vondruš 13 years ago
parent
b71310f6d0
commit
ca9ed0150b
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Plugins/TgaImporter/Test/TgaImporterTest.cpp

6
src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
Unescape View File

@ -143,7 +143,7 @@ void TgaImporterTest::colorBits24() {
#endif #endif
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte);
CORRADE_COMPARE(std::string(static_cast<const char*>(image->data()), 2*3*3), std::string(pixels, 2*3*3)); CORRADE_COMPARE(std::string(reinterpret_cast<const char*>(image->data()), 2*3*3), std::string(pixels, 2*3*3));
delete image; delete image;
} }
@ -176,7 +176,7 @@ void TgaImporterTest::colorBits32() {
#endif #endif
CORRADE_COMPARE(image->size(), Math::Vector2<GLsizei>(2, 3)); CORRADE_COMPARE(image->size(), Math::Vector2<GLsizei>(2, 3));
CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte);
CORRADE_COMPARE(std::string(static_cast<const char*>(image->data()), 2*3*3), std::string(pixels, 2*3*3)); CORRADE_COMPARE(std::string(reinterpret_cast<const char*>(image->data()), 2*3*3), std::string(pixels, 2*3*3));
delete image; delete image;
} }
@ -196,7 +196,7 @@ void TgaImporterTest::grayscaleBits8() {
CORRADE_COMPARE(image->format(), Trade::ImageData2D::Format::Red); CORRADE_COMPARE(image->format(), Trade::ImageData2D::Format::Red);
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte); CORRADE_COMPARE(image->type(), Trade::ImageData2D::Type::UnsignedByte);
CORRADE_COMPARE(std::string(static_cast<const char*>(image->data()), 2*3), std::string(data + 18, 2*3)); CORRADE_COMPARE(std::string(reinterpret_cast<const char*>(image->data()), 2*3), std::string(data + 18, 2*3));
} }
void TgaImporterTest::grayscaleBits16() { void TgaImporterTest::grayscaleBits16() {

Write Preview
Loading…
Cancel
Save