From 1c32aed1efb64d96d98c026ace76d34fee53550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 19 May 2023 20:22:48 +0200 Subject: [PATCH] Trade: minor. --- src/Magnum/Trade/SceneData.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Trade/SceneData.cpp b/src/Magnum/Trade/SceneData.cpp index 6e1230b66..cc6a9d7e9 100644 --- a/src/Magnum/Trade/SceneData.cpp +++ b/src/Magnum/Trade/SceneData.cpp @@ -558,14 +558,15 @@ Debug& operator<<(Debug& debug, const SceneFieldFlags value) { } SceneFieldData::SceneFieldData(const SceneField name, const Containers::StridedArrayView2D& mappingData, const SceneFieldType fieldType, const Containers::StridedArrayView2D& fieldData, const UnsignedShort fieldArraySize, const SceneFieldFlags flags) noexcept: SceneFieldData{name, {}, Containers::StridedArrayView1D{{mappingData.data(), ~std::size_t{}}, mappingData.size()[0], mappingData.stride()[0]}, fieldType, Containers::StridedArrayView1D{{fieldData.data(), ~std::size_t{}}, fieldData.size()[0], fieldData.stride()[0]}, fieldArraySize, flags} { + /* Yes, this calls into a constexpr function defined in the header -- + because I feel that makes more sense than duplicating the full assert + logic */ #ifdef CORRADE_GRACEFUL_ASSERT /* This caused an assertion in the delegated-to constructor, bail instead of cascading the asserts further */ if(fieldType == SceneFieldType::Bit) return; #endif - /* Yes, this calls into a constexpr function defined in the header -- - because I feel that makes more sense than duplicating the full assert - logic */ + #ifndef CORRADE_NO_ASSERT if(fieldArraySize) CORRADE_ASSERT(fieldData.isEmpty()[0] || fieldData.size()[1] == sceneFieldTypeSize(fieldType)*fieldArraySize, "Trade::SceneFieldData: second field view dimension size" << fieldData.size()[1] << "doesn't match" << fieldType << "and field array size" << fieldArraySize, ); @@ -616,6 +617,7 @@ SceneFieldData::SceneFieldData(const SceneField name, const Containers::StridedA /* Yes, this calls into a constexpr function defined in the header -- because I feel that makes more sense than duplicating the full assert logic */ + CORRADE_ASSERT(fieldData.isContiguous<1>(), "Trade::SceneFieldData: second field view dimension is not contiguous", ); }