Browse Source

Trade: minor.

catastrophic-cross
Vladimír Vondruš 6 years ago
parent
commit
73f1fa7724
  1. 2
      src/Magnum/Trade/MeshData.cpp
  2. 6
      src/Magnum/Trade/Test/MeshDataTest.cpp

2
src/Magnum/Trade/MeshData.cpp

@ -243,7 +243,7 @@ Containers::StridedArrayView2D<char> MeshData::mutableIndices() {
CORRADE_ASSERT(isIndexed(), CORRADE_ASSERT(isIndexed(),
"Trade::MeshData::mutableIndices(): the mesh is not indexed", {}); "Trade::MeshData::mutableIndices(): the mesh is not indexed", {});
const std::size_t indexTypeSize = meshIndexTypeSize(_indexType); const std::size_t indexTypeSize = meshIndexTypeSize(_indexType);
/* Build a 2D view using information about attribute type size */ /* Build a 2D view using information about index type size */
Containers::StridedArrayView2D<const char> out{{_indices, _indexCount*indexTypeSize}, {_indexCount, indexTypeSize}}; Containers::StridedArrayView2D<const char> out{{_indices, _indexCount*indexTypeSize}, {_indexCount, indexTypeSize}};
/** @todo some arrayConstCast? UGH */ /** @todo some arrayConstCast? UGH */
return Containers::StridedArrayView2D<char>{ return Containers::StridedArrayView2D<char>{

6
src/Magnum/Trade/Test/MeshDataTest.cpp

@ -166,7 +166,7 @@ struct MeshDataTest: TestSuite::Tester {
void releaseVertexData(); void releaseVertexData();
}; };
struct { const struct {
const char* name; const char* name;
UnsignedInt vertexCount, expectedVertexCount; UnsignedInt vertexCount, expectedVertexCount;
} ConstructData[] { } ConstructData[] {
@ -176,7 +176,7 @@ struct {
{"explicit zero vertex count", 0, 0} {"explicit zero vertex count", 0, 0}
}; };
struct { const struct {
const char* name; const char* name;
DataFlags indexDataFlags, vertexDataFlags; DataFlags indexDataFlags, vertexDataFlags;
} NotOwnedData[] { } NotOwnedData[] {
@ -186,7 +186,7 @@ struct {
{"both mutable", DataFlag::Mutable, DataFlag::Mutable} {"both mutable", DataFlag::Mutable, DataFlag::Mutable}
}; };
struct { const struct {
const char* name; const char* name;
DataFlags dataFlags; DataFlags dataFlags;
} SingleNotOwnedData[] { } SingleNotOwnedData[] {

Loading…
Cancel
Save