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

Use the new, shorter Containers::Size / Stride typedefs.

pull/582/merge
Vladimír Vondruš 4 years ago
parent
12c74a351f
commit
7de32e2013
5 changed files with 36 additions and 38 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. 4
      src/Magnum/Implementation/ImageProperties.h
  2. 16
      src/Magnum/Test/ImageTest.cpp
  3. 14
      src/Magnum/Test/ImageViewTest.cpp
  4. 16
      src/Magnum/Trade/Test/ImageDataTest.cpp
  5. 24
      src/Magnum/Trade/Test/MeshDataTest.cpp

4
src/Magnum/Implementation/ImageProperties.h
Unescape View File

@ -68,7 +68,7 @@ template<UnsignedInt dimensions, class T, class Image, class Data> Containers::S
/* Size in the last dimension is byte size of the pixel, the remaining
dimensions are reverted (first images, then rows, then pixels, last
pixel bytes) */
Containers::StridedDimensions<dimensions + 1, std::size_t> size{NoInit};
Containers::Size<dimensions + 1> size{NoInit};
size[dimensions] = image.pixelSize();
for(UnsignedInt i = dimensions; i != 0; --i)
size[i - 1] = image.size()[dimensions - i];
@ -78,7 +78,7 @@ template<UnsignedInt dimensions, class T, class Image, class Data> Containers::S
(first image size, then row size, then pixel size, last 1). The
data properties include pixel size in row size, so we have to take it
out from the cumulative product. */
Containers::StridedDimensions<dimensions + 1, std::ptrdiff_t> stride{NoInit};
Containers::Stride<dimensions + 1> stride{NoInit};
stride[dimensions] = 1;
stride[dimensions - 1] = 1;
for(UnsignedInt i = dimensions - 1; i != 0; --i)

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

@ -850,15 +850,15 @@ void ImageTest::pixels2D() {
{
Containers::StridedArrayView2D<Color3ub> pixels = image.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView2D<Color3ub>::Size{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView2D<Color3ub>::Stride{20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size2D{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride2D{20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 2*20 + 3*3);
CORRADE_COMPARE(pixels[3][0], (Color3ub{4, 5, 6}));
CORRADE_COMPARE(pixels[3][1], (Color3ub{7, 8, 9}));
} {
Containers::StridedArrayView2D<const Color3ub> pixels = cimage.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView2D<const Color3ub>::Size{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView2D<const Color3ub>::Stride{20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size2D{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride2D{20, 3}));
CORRADE_COMPARE(pixels.data(), cimage.data() + 2*20 + 3*3);
CORRADE_COMPARE(pixels[3][0], (Color3ub{4, 5, 6}));
CORRADE_COMPARE(pixels[3][1], (Color3ub{7, 8, 9}));
@ -910,15 +910,15 @@ void ImageTest::pixels3D() {
{
Containers::StridedArrayView3D<Color3ub> pixels = image.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView3D<Color3ub>::Size{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView3D<Color3ub>::Stride{140, 20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size3D{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride3D{140, 20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 140 + 2*20 + 3*3);
CORRADE_COMPARE(pixels[1][3][0], (Color3ub{9, 8, 7}));
CORRADE_COMPARE(pixels[1][3][1], (Color3ub{6, 5, 4}));
} {
Containers::StridedArrayView3D<const Color3ub> pixels = cimage.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView3D<const Color3ub>::Size{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView3D<const Color3ub>::Stride{140, 20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size3D{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride3D{140, 20, 3}));
CORRADE_COMPARE(pixels.data(), cimage.data() + 140 + 2*20 + 3*3);
CORRADE_COMPARE(pixels[1][3][0], (Color3ub{9, 8, 7}));
CORRADE_COMPARE(pixels[1][3][1], (Color3ub{6, 5, 4}));

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

@ -871,8 +871,8 @@ template<class T> void ImageViewTest::pixels2D() {
auto pixels = image.template pixels<Color3ub>();
CORRADE_COMPARE(decltype(pixels)::Dimensions, 2);
CORRADE_COMPARE(std::is_const<typename decltype(pixels)::Type>::value, std::is_const<T>::value);
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView2D<Color3ub>::Size{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView2D<Color3ub>::Stride{20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size2D{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride2D{20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 2*20 + 3*3);
}
@ -893,8 +893,8 @@ template<class T> void ImageViewTest::pixels3D() {
auto pixels = image.template pixels<Color3ub>();
CORRADE_COMPARE(decltype(pixels)::Dimensions, 3);
CORRADE_COMPARE(std::is_const<typename decltype(pixels)::Type>::value, std::is_const<T>::value);
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView3D<Color3ub>::Size{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView3D<Color3ub>::Stride{140, 20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size3D{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride3D{140, 20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 140 + 2*20 + 3*3);
}
@ -905,12 +905,10 @@ void ImageViewTest::pixelsNullptr() {
CORRADE_COMPARE(image.data().size(), 0);
CORRADE_COMPARE(image.pixels().data(), nullptr);
CORRADE_COMPARE(image.pixels().size(),
Containers::StridedArrayView4D<const char>::Size{});
CORRADE_COMPARE(image.pixels().size(), Containers::Size4D{});
CORRADE_COMPARE(image.pixels<Color3ub>().data(), nullptr);
CORRADE_COMPARE(image.pixels<Color3ub>().size(),
Containers::StridedArrayView3D<Color3ub>::Size{});
CORRADE_COMPARE(image.pixels<Color3ub>().size(), Containers::Size3D{});
}
}}}

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

@ -1107,13 +1107,13 @@ void ImageDataTest::pixels2D() {
{
Containers::StridedArrayView2D<Color3ub> pixels = image.mutablePixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView2D<Color3ub>::Size{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView2D<Color3ub>::Stride{20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size2D{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride2D{20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 2*20 + 3*3);
} {
Containers::StridedArrayView2D<const Color3ub> pixels = cimage.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView2D<const Color3ub>::Size{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView2D<const Color3ub>::Stride{20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size2D{4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride2D{20, 3}));
CORRADE_COMPARE(pixels.data(), cimage.data() + 2*20 + 3*3);
}
}
@ -1133,13 +1133,13 @@ void ImageDataTest::pixels3D() {
{
Containers::StridedArrayView3D<Color3ub> pixels = image.mutablePixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView3D<Color3ub>::Size{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView3D<Color3ub>::Stride{140, 20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size3D{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride3D{140, 20, 3}));
CORRADE_COMPARE(pixels.data(), image.data() + 140 + 2*20 + 3*3);
} {
Containers::StridedArrayView3D<const Color3ub> pixels = cimage.pixels<Color3ub>();
CORRADE_COMPARE(pixels.size(), (Containers::StridedArrayView3D<const Color3ub>::Size{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::StridedArrayView3D<const Color3ub>::Stride{140, 20, 3}));
CORRADE_COMPARE(pixels.size(), (Containers::Size3D{3, 4, 2}));
CORRADE_COMPARE(pixels.stride(), (Containers::Stride3D{140, 20, 3}));
CORRADE_COMPARE(pixels.data(), cimage.data() + 140 + 2*20 + 3*3);
}
}

24
src/Magnum/Trade/Test/MeshDataTest.cpp
Unescape View File

@ -1481,8 +1481,8 @@ void MeshDataTest::constructZeroIndices() {
CORRADE_VERIFY(data.isIndexed());
CORRADE_COMPARE(data.indexType(), MeshIndexType::UnsignedInt);
CORRADE_COMPARE(data.indexCount(), 0);
CORRADE_COMPARE(data.indices().size(), (Containers::StridedArrayView2D<std::size_t>::Size{0, 4}));
CORRADE_COMPARE(data.mutableIndices().size(), (Containers::StridedArrayView2D<std::size_t>::Size{0, 4}));
CORRADE_COMPARE(data.indices().size(), (Containers::Size2D{0, 4}));
CORRADE_COMPARE(data.mutableIndices().size(), (Containers::Size2D{0, 4}));
CORRADE_COMPARE(data.vertexCount(), 3);
}
@ -1548,9 +1548,9 @@ void MeshDataTest::constructIndexless() {
CORRADE_VERIFY(!data.isIndexed());
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.indices().data(), nullptr);
CORRADE_COMPARE(data.indices().size(), (Containers::StridedArrayView2D<std::size_t>::Size{0, 0}));
CORRADE_COMPARE(data.indices().size(), (Containers::Size2D{0, 0}));
CORRADE_COMPARE(data.mutableIndices().data(), nullptr);
CORRADE_COMPARE(data.mutableIndices().size(), (Containers::StridedArrayView2D<std::size_t>::Size{0, 0}));
CORRADE_COMPARE(data.mutableIndices().size(), (Containers::Size2D{0, 0}));
CORRADE_COMPARE(data.vertexCount(), 3);
CORRADE_COMPARE(data.attributeCount(), 1);
@ -2051,10 +2051,10 @@ void MeshDataTest::constructSpecialIndexStridesImplementationSpecificIndexType()
CORRADE_COMPARE(mesh.indexStride(), 0);
CORRADE_COMPARE(mesh.indices().size(), (Containers::StridedDimensions<2, std::size_t>{4, 0}));
CORRADE_COMPARE(mesh.mutableIndices().size(), (Containers::StridedDimensions<2, std::size_t>{4, 0}));
CORRADE_COMPARE(mesh.indices().stride(), (Containers::StridedDimensions<2, std::ptrdiff_t>{0, 1}));
CORRADE_COMPARE(mesh.mutableIndices().stride(), (Containers::StridedDimensions<2, std::ptrdiff_t>{0, 1}));
CORRADE_COMPARE(mesh.indices().size(), (Containers::Size2D{4, 0}));
CORRADE_COMPARE(mesh.mutableIndices().size(), (Containers::Size2D{4, 0}));
CORRADE_COMPARE(mesh.indices().stride(), (Containers::Stride2D{0, 1}));
CORRADE_COMPARE(mesh.mutableIndices().stride(), (Containers::Stride2D{0, 1}));
CORRADE_COMPARE(*reinterpret_cast<const UnsignedShort*>(mesh.indices().data()), 15);
CORRADE_COMPARE(*reinterpret_cast<UnsignedShort*>(mesh.mutableIndices().data()), 15);
@ -2156,10 +2156,10 @@ void MeshDataTest::constructSpecialAttributeStridesImplementationSpecificVertexF
element size is zero as well, meaning there's no way to access anything
except for directly interpreting the data pointer. Which is actually as
desired for implementation-specific vertex formats. */
CORRADE_COMPARE(mesh.attribute(0).size(), (Containers::StridedDimensions<2, std::size_t>{4, 0}));
CORRADE_COMPARE(mesh.mutableAttribute(0).size(), (Containers::StridedDimensions<2, std::size_t>{4, 0}));
CORRADE_COMPARE(mesh.attribute(0).stride(), (Containers::StridedDimensions<2, std::ptrdiff_t>{0, 1}));
CORRADE_COMPARE(mesh.mutableAttribute(0).stride(), (Containers::StridedDimensions<2, std::ptrdiff_t>{0, 1}));
CORRADE_COMPARE(mesh.attribute(0).size(), (Containers::Size2D{4, 0}));
CORRADE_COMPARE(mesh.mutableAttribute(0).size(), (Containers::Size2D{4, 0}));
CORRADE_COMPARE(mesh.attribute(0).stride(), (Containers::Stride2D{0, 1}));
CORRADE_COMPARE(mesh.mutableAttribute(0).stride(), (Containers::Stride2D{0, 1}));
CORRADE_COMPARE(*reinterpret_cast<const UnsignedShort*>(mesh.attribute(0).data()), 15);
CORRADE_COMPARE(*reinterpret_cast<UnsignedShort*>(mesh.mutableAttribute(0).data()), 15);
CORRADE_COMPARE_AS((Containers::arrayCast<1, const UnsignedShort>(mesh.attribute(1))),

Write Preview
Loading…
Cancel
Save