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

Test: don't compare addresses as char*. 

When such a comparison fails, it prints both values as a string, which
can lead to just anything including irreversibly breaking the terminal.
pull/651/merge
Vladimír Vondruš 1 year ago
parent
a184db4cb6
commit
5441821ce8
3 changed files with 77 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 66
      src/Magnum/Test/ImageTest.cpp
  2. 46
      src/Magnum/Test/ImageViewTest.cpp
  3. 42
      src/Magnum/Trade/Test/ImageDataTest.cpp

66
src/Magnum/Test/ImageTest.cpp
Unescape View File

@ -195,7 +195,7 @@ void ImageTest::constructGeneric() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 4);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 4*4);
} {
auto data = new char[3*2];
@ -208,7 +208,7 @@ void ImageTest::constructGeneric() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 2);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*2);
}
}
@ -255,7 +255,7 @@ void ImageTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*12);
} {
auto data = new char[3*12];
@ -268,7 +268,7 @@ void ImageTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*12);
}
@ -283,7 +283,7 @@ void ImageTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*8);
} {
auto data = new char[3*6];
@ -295,7 +295,7 @@ void ImageTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
}
@ -310,7 +310,7 @@ void ImageTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
}
}
@ -402,7 +402,7 @@ void ImageTest::constructCompressedGeneric() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
} {
auto data = new char[8];
@ -414,7 +414,7 @@ void ImageTest::constructCompressedGeneric() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), Vector2i(4, 4));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
}
}
@ -455,7 +455,7 @@ void ImageTest::constructCompressedImplementationSpecific() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
} {
auto data = new char[8];
@ -467,7 +467,7 @@ void ImageTest::constructCompressedImplementationSpecific() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
}
@ -601,14 +601,14 @@ void ImageTest::constructMoveGeneric() {
CORRADE_COMPARE(b.formatExtra(), 0);
CORRADE_COMPARE(b.pixelSize(), 16);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*16);
auto data2 = new char[24];
Image2D c{PixelFormat::R8I, {2, 6}, Containers::Array<char>{data2, 24}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{2, 6}));
CORRADE_COMPARE(c.flags(), ImageFlag2D::Array);
@ -617,7 +617,7 @@ void ImageTest::constructMoveGeneric() {
CORRADE_COMPARE(c.formatExtra(), 0);
CORRADE_COMPARE(c.pixelSize(), 16);
CORRADE_COMPARE(c.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 3*16);
CORRADE_VERIFY(std::is_nothrow_move_constructible<Image2D>::value);
@ -639,7 +639,7 @@ void ImageTest::constructMoveImplementationSpecific() {
CORRADE_COMPARE(b.formatExtra(), 1337);
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
auto data2 = new char[12*4*2];
@ -647,7 +647,7 @@ void ImageTest::constructMoveImplementationSpecific() {
1, 2, 8, {2, 6}, Containers::Array<char>{data2, 12*4*2}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), Vector2i(2, 6));
CORRADE_COMPARE(c.flags(), ImageFlag2D::Array);
@ -656,7 +656,7 @@ void ImageTest::constructMoveImplementationSpecific() {
CORRADE_COMPARE(c.formatExtra(), 1337);
CORRADE_COMPARE(c.pixelSize(), 6);
CORRADE_COMPARE(c.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 3*6);
}
@ -674,21 +674,21 @@ void ImageTest::constructMoveCompressedGeneric() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), CompressedPixelFormat::Bc3RGBAUnorm);
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
auto data2 = new char[16];
CompressedImage2D c{CompressedPixelFormat::Bc1RGBAUnorm, {8, 4}, Containers::Array<char>{data2, 16}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{8, 4}));
CORRADE_COMPARE(c.flags(), ImageFlag2D::Array);
CORRADE_COMPARE(c.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(c.format(), CompressedPixelFormat::Bc3RGBAUnorm);
CORRADE_COMPARE(c.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 8);
CORRADE_VERIFY(std::is_nothrow_move_constructible<CompressedImage2D>::value);
@ -709,21 +709,21 @@ void ImageTest::constructMoveCompressedImplementationSpecific() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
auto data2 = new char[16];
CompressedImage2D c{CompressedPixelFormat::Bc2RGBAUnorm, {8, 4}, Containers::Array<char>{data2, 16}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{8, 4}));
CORRADE_COMPARE(c.flags(), ImageFlag2D::Array);
CORRADE_COMPARE(c.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(c.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(c.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 8);
}
@ -741,7 +741,7 @@ template<class T> void ImageTest::toViewGeneric() {
CORRADE_COMPARE(b.formatExtra(), 0);
CORRADE_COMPARE(b.pixelSize(), 4);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
}
template<class T> void ImageTest::toViewImplementationSpecific() {
@ -758,7 +758,7 @@ template<class T> void ImageTest::toViewImplementationSpecific() {
CORRADE_COMPARE(b.formatExtra(), 1337);
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
}
template<class T> void ImageTest::toViewCompressedGeneric() {
@ -774,7 +774,7 @@ template<class T> void ImageTest::toViewCompressedGeneric() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), CompressedPixelFormat::Bc1RGBUnorm);
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
}
@ -791,7 +791,7 @@ template<class T> void ImageTest::toViewCompressedImplementationSpecific() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
}
@ -799,8 +799,8 @@ void ImageTest::data() {
auto data = new char[4*4];
Image2D a{PixelFormat::RGBA8Unorm, {1, 3}, Containers::Array<char>{data, 4*4}};
const Image2D& ca = a;
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(ca.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(ca.data(), static_cast<const void*>(data));
}
void ImageTest::dataCompressed() {
@ -808,15 +808,15 @@ void ImageTest::dataCompressed() {
CompressedImage2D a{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4},
Containers::Array<char>{data, 8}};
const CompressedImage2D& ca = a;
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(ca.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(ca.data(), static_cast<const void*>(data));
}
void ImageTest::dataRvalue() {
auto data = new char[4*4];
Containers::Array<char> released = Image2D{PixelFormat::RGBA8Unorm, {1, 3},
Containers::Array<char>{data, 4*4}}.data();
CORRADE_COMPARE(released.data(), data);
CORRADE_COMPARE(released.data(), static_cast<const void*>(data));
}
void ImageTest::dataRvalueCompressed() {
@ -824,7 +824,7 @@ void ImageTest::dataRvalueCompressed() {
Containers::Array<char> released = CompressedImage2D{
CompressedPixelFormat::Bc1RGBAUnorm, {4, 4},
Containers::Array<char>{data, 8}}.data();
CORRADE_COMPARE(released.data(), data);
CORRADE_COMPARE(released.data(), static_cast<const void*>(data));
}
void ImageTest::dataProperties() {

46
src/Magnum/Test/ImageViewTest.cpp
Unescape View File

@ -189,7 +189,7 @@ template<class T> void ImageViewTest::constructGeneric() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 4);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 4*4);
} {
T data[3*2]{};
@ -202,7 +202,7 @@ template<class T> void ImageViewTest::constructGeneric() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 2);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*2);
}
}
@ -248,7 +248,7 @@ template<class T> void ImageViewTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*12);
} {
T data[3*12]{};
@ -261,7 +261,7 @@ template<class T> void ImageViewTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*12);
}
@ -276,7 +276,7 @@ template<class T> void ImageViewTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i(1, 3));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*8);
} {
T data[3*6]{};
@ -288,7 +288,7 @@ template<class T> void ImageViewTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i(1, 3));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
}
@ -303,7 +303,7 @@ template<class T> void ImageViewTest::constructImplementationSpecific() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i(1, 3));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
}
}
@ -383,7 +383,7 @@ template<class T> void ImageViewTest::constructCompressedGeneric() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
} {
T data[8]{};
@ -395,7 +395,7 @@ template<class T> void ImageViewTest::constructCompressedGeneric() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
}
}
@ -436,7 +436,7 @@ template<class T> void ImageViewTest::constructCompressedImplementationSpecific(
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
} {
T data[8]{};
@ -447,7 +447,7 @@ template<class T> void ImageViewTest::constructCompressedImplementationSpecific(
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
}
@ -492,7 +492,7 @@ void ImageViewTest::construct3DFrom1D() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), 3);
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
/* Not testing the flags parameter here to be sure implicit conversion
@ -504,7 +504,7 @@ void ImageViewTest::construct3DFrom1D() {
CORRADE_COMPARE(b.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector3i{3, 1, 1}));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
/* Conversion the other way is not allowed (will be later, but explicitly
@ -526,7 +526,7 @@ void ImageViewTest::construct3DFrom2D() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
MutableImageView3D b = {a, ImageFlag3D(0x00a0)};
@ -538,7 +538,7 @@ void ImageViewTest::construct3DFrom2D() {
CORRADE_COMPARE(b.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector3i{1, 3, 1}));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
/* Conversion the other way is not allowed (will be later, but explicitly
@ -560,7 +560,7 @@ void ImageViewTest::constructCompressed3DFrom1D() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), 4);
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
/* Not testing the flags parameter here to be sure implicit conversion
@ -570,7 +570,7 @@ void ImageViewTest::constructCompressed3DFrom1D() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector3i{4, 1, 1}));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
/* Conversion the other way is not allowed (will be later, but explicitly
@ -591,7 +591,7 @@ void ImageViewTest::constructCompressed3DFrom2D() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 8}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8*2);
MutableCompressedImageView3D b = {a, ImageFlag3D(0x00a0)};
@ -601,7 +601,7 @@ void ImageViewTest::constructCompressed3DFrom2D() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector3i{4, 8, 1}));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8*2);
/* Conversion the other way is not allowed (will be later, but explicitly
@ -621,7 +621,7 @@ void ImageViewTest::constructFromMutable() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i(1, 3));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 3*6);
ImageView2D b = a;
@ -631,7 +631,7 @@ void ImageViewTest::constructFromMutable() {
CORRADE_COMPARE(b.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), Vector2i(1, 3));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
}
@ -645,7 +645,7 @@ void ImageViewTest::constructCompressedFromMutable() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(a.data(), &data[0]);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(a.data().size(), 8);
CompressedImageView2D b = a;
@ -653,7 +653,7 @@ void ImageViewTest::constructCompressedFromMutable() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), &data[0]);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
}

42
src/Magnum/Trade/Test/ImageDataTest.cpp
Unescape View File

@ -783,7 +783,7 @@ void ImageDataTest::constructMoveGeneric() {
CORRADE_COMPARE(b.formatExtra(), 0);
CORRADE_COMPARE(b.pixelSize(), 16);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*16);
CORRADE_COMPARE(b.importerState(), &state);
@ -791,7 +791,7 @@ void ImageDataTest::constructMoveGeneric() {
ImageData2D c{PixelFormat::R8I, {2, 6}, Containers::Array<char>{data2, 24}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{2, 6}));
CORRADE_COMPARE(c.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -802,7 +802,7 @@ void ImageDataTest::constructMoveGeneric() {
CORRADE_COMPARE(c.formatExtra(), 0);
CORRADE_COMPARE(c.pixelSize(), 16);
CORRADE_COMPARE(c.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 3*16);
CORRADE_COMPARE(c.importerState(), &state);
@ -828,7 +828,7 @@ void ImageDataTest::constructMoveImplementationSpecific() {
CORRADE_COMPARE(b.formatExtra(), 1337);
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
CORRADE_COMPARE(b.importerState(), &state);
@ -837,7 +837,7 @@ void ImageDataTest::constructMoveImplementationSpecific() {
1, 2, 8, {2, 6}, Containers::Array<char>{data2, 12*4*2}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), Vector2i(2, 6));
CORRADE_COMPARE(c.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -848,7 +848,7 @@ void ImageDataTest::constructMoveImplementationSpecific() {
CORRADE_COMPARE(c.formatExtra(), 1337);
CORRADE_COMPARE(c.pixelSize(), 6);
CORRADE_COMPARE(c.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 3*6);
CORRADE_COMPARE(c.importerState(), &state);
}
@ -870,7 +870,7 @@ void ImageDataTest::constructMoveCompressedGeneric() {
CORRADE_COMPARE(b.compressedStorage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.compressedFormat(), CompressedPixelFormat::Bc3RGBAUnorm);
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
CORRADE_COMPARE(b.importerState(), &state);
@ -878,7 +878,7 @@ void ImageDataTest::constructMoveCompressedGeneric() {
ImageData2D c{CompressedPixelFormat::Bc1RGBAUnorm, {8, 4}, Containers::Array<char>{data2, 16}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{8, 4}));
CORRADE_COMPARE(c.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -887,7 +887,7 @@ void ImageDataTest::constructMoveCompressedGeneric() {
CORRADE_COMPARE(c.compressedStorage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(c.compressedFormat(), CompressedPixelFormat::Bc3RGBAUnorm);
CORRADE_COMPARE(c.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 8);
CORRADE_COMPARE(c.importerState(), &state);
}
@ -909,7 +909,7 @@ void ImageDataTest::constructMoveCompressedImplementationSpecific() {
CORRADE_COMPARE(b.compressedStorage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.compressedFormat(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
CORRADE_COMPARE(b.importerState(), &state);
@ -917,7 +917,7 @@ void ImageDataTest::constructMoveCompressedImplementationSpecific() {
ImageData2D c{CompressedPixelFormat::Bc2RGBAUnorm, {8, 4}, Containers::Array<char>{data2, 16}};
c = Utility::move(b);
CORRADE_COMPARE(b.data(), data2);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data2));
CORRADE_COMPARE(b.size(), (Vector2i{8, 4}));
CORRADE_COMPARE(c.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -926,7 +926,7 @@ void ImageDataTest::constructMoveCompressedImplementationSpecific() {
CORRADE_COMPARE(c.compressedStorage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(c.compressedFormat(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(c.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(c.data(), data);
CORRADE_COMPARE(c.data(), static_cast<const void*>(data));
CORRADE_COMPARE(c.data().size(), 8);
CORRADE_COMPARE(c.importerState(), &state);
}
@ -950,7 +950,7 @@ void ImageDataTest::constructMoveAttachState() {
CORRADE_COMPARE(b.formatExtra(), 1337);
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 3*6);
CORRADE_COMPARE(b.importerState(), &stateNew);
}
@ -973,7 +973,7 @@ void ImageDataTest::constructMoveCompressedAttachState() {
CORRADE_COMPARE(b.compressedStorage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.compressedFormat(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
CORRADE_COMPARE(b.importerState(), &stateNew);
}
@ -1104,7 +1104,7 @@ template<class T> void ImageDataTest::toViewGeneric() {
CORRADE_COMPARE(b.formatExtra(), 0);
CORRADE_COMPARE(b.pixelSize(), 4);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
}
template<class T> void ImageDataTest::toViewImplementationSpecific() {
@ -1121,7 +1121,7 @@ template<class T> void ImageDataTest::toViewImplementationSpecific() {
CORRADE_COMPARE(b.formatExtra(), 1337);
CORRADE_COMPARE(b.pixelSize(), 6);
CORRADE_COMPARE(b.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
}
template<class T> void ImageDataTest::toViewCompressedGeneric() {
@ -1137,7 +1137,7 @@ template<class T> void ImageDataTest::toViewCompressedGeneric() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), CompressedPixelFormat::Bc1RGBUnorm);
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
}
@ -1154,7 +1154,7 @@ template<class T> void ImageDataTest::toViewCompressedImplementationSpecific() {
CORRADE_COMPARE(b.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(b.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(b.size(), (Vector2i{4, 4}));
CORRADE_COMPARE(b.data(), data);
CORRADE_COMPARE(b.data(), static_cast<const void*>(data));
CORRADE_COMPARE(b.data().size(), 8);
}
@ -1162,15 +1162,15 @@ void ImageDataTest::data() {
auto data = new char[4*4];
ImageData2D a{PixelFormat::RGBA8Unorm, {1, 3}, Containers::Array<char>{data, 4*4}};
const ImageData2D& ca = a;
CORRADE_COMPARE(a.data(), data);
CORRADE_COMPARE(ca.data(), data);
CORRADE_COMPARE(a.data(), static_cast<const void*>(data));
CORRADE_COMPARE(ca.data(), static_cast<const void*>(data));
}
void ImageDataTest::dataRvalue() {
auto data = new char[4*4];
Containers::Array<char> released = ImageData2D{PixelFormat::RGBA8Unorm,
{1, 3}, Containers::Array<char>{data, 4*4}}.data();
CORRADE_COMPARE(released.data(), data);
CORRADE_COMPARE(released.data(), static_cast<const void*>(data));
}
void ImageDataTest::mutableAccessNotAllowed() {

Write Preview
Loading…
Cancel
Save