From 8870becb1df3e0e44f3c990012ae273d0dcdbc87 Mon Sep 17 00:00:00 2001 From: vredez <5558397+vredez@users.noreply.github.com> Date: Mon, 24 May 2021 16:43:39 +0200 Subject: [PATCH 1/2] Remove unnecessary semicolon --- gli/core/format.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gli/core/format.inl b/gli/core/format.inl index 180bf4f74..ce65ade07 100644 --- a/gli/core/format.inl +++ b/gli/core/format.inl @@ -283,7 +283,7 @@ namespace detail GLI_ASSERT(Format != FORMAT_UNDEFINED); return Table[Format - FORMAT_FIRST]; - }; + } inline std::uint32_t bits_per_pixel(format Format) { From 46bb9f905cf830256b5f534b1601ae9bcff6174c Mon Sep 17 00:00:00 2001 From: vredez <5558397+vredez@users.noreply.github.com> Date: Tue, 1 Jun 2021 10:14:50 +0200 Subject: [PATCH 2/2] Inline assertion expression --- gli/core/load_dds.inl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gli/core/load_dds.inl b/gli/core/load_dds.inl index d8258bfbf..4a46ff8a5 100644 --- a/gli/core/load_dds.inl +++ b/gli/core/load_dds.inl @@ -292,8 +292,7 @@ namespace detail texture::extent_type(Header.Width, Header.Height, DepthCount), std::max(Header10.ArraySize, 1), FaceCount, MipMapCount); - std::size_t const SourceSize = Offset + Texture.size(); - GLI_ASSERT(SourceSize == Size); + GLI_ASSERT(Offset + Texture.size() == Size); std::memcpy(Texture.data(), Data + Offset, Texture.size());