From e6bf11c48ec853e0a40d6e64e0f39cfe4ef62d42 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 17 Dec 2022 14:49:22 +0100 Subject: [PATCH] Minor fixes --- src/Nazara/Utility/Image.cpp | 6 +++--- src/Nazara/Widgets/BoxLayout.cpp | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Nazara/Utility/Image.cpp b/src/Nazara/Utility/Image.cpp index 42e919afc..f433caa63 100644 --- a/src/Nazara/Utility/Image.cpp +++ b/src/Nazara/Utility/Image.cpp @@ -1368,7 +1368,7 @@ namespace Nz UInt8 Image::GetMaxLevel(unsigned int width, unsigned int height, unsigned int depth) { // Le niveau maximal est le niveau requis pour la plus grande taille - return std::max(IntegralLog2(std::max({width, height, depth})), 1U); + return SafeCast(std::max(IntegralLog2(std::max({width, height, depth})), 1U)); } UInt8 Image::GetMaxLevel(ImageType type, unsigned int width, unsigned int height, unsigned int depth) @@ -1425,9 +1425,9 @@ namespace Nz if (m_sharedImage->refCount > 1) { SharedImage::PixelContainer levels(m_sharedImage->levels.size()); - for (unsigned int i = 0; i < levels.size(); ++i) + for (std::size_t i = 0; i < levels.size(); ++i) { - std::size_t size = GetMemoryUsage(i); + std::size_t size = GetMemoryUsage(SafeCast(i)); levels[i] = std::make_unique(size); std::memcpy(levels[i].get(), m_sharedImage->levels[i].get(), size); } diff --git a/src/Nazara/Widgets/BoxLayout.cpp b/src/Nazara/Widgets/BoxLayout.cpp index 0c0f5c098..22bba4d7a 100644 --- a/src/Nazara/Widgets/BoxLayout.cpp +++ b/src/Nazara/Widgets/BoxLayout.cpp @@ -43,10 +43,6 @@ namespace Nz case BoxLayoutOrientation::Vertical: axis = 1; //< y break; - - default: - assert(false); - break; } //TODO: Keep solver state when widgets don't change @@ -106,7 +102,7 @@ namespace Nz return; Nz::Vector2f newSize = layoutSize; - newSize[axis] = m_state->sizeVar[varIndex].value(); + newSize[axis] = SafeCast(m_state->sizeVar[varIndex].value()); child->Resize(newSize); remainingSize -= newSize[axis];