From 1a9e72c9bbed1842621969f035dec47ac75d9db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 28 Jan 2021 17:28:21 +0100 Subject: [PATCH] DiscIO: Use MathUtil::SaturatingCast --- Source/Core/DiscIO/WIACompression.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Core/DiscIO/WIACompression.cpp b/Source/Core/DiscIO/WIACompression.cpp index 5b5da07a37..17231f63b3 100644 --- a/Source/Core/DiscIO/WIACompression.cpp +++ b/Source/Core/DiscIO/WIACompression.cpp @@ -19,6 +19,7 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" +#include "Common/MathUtil.h" #include "Common/Swap.h" #include "DiscIO/LaggedFibonacciGenerator.h" @@ -166,18 +167,13 @@ bool Bzip2Decompressor::Decompress(const DecompressionBuffer& in, DecompressionB m_started = true; } - constexpr auto clamped_cast = [](size_t x) { - return static_cast( - std::min(std::numeric_limits().max(), x)); - }; - char* const in_ptr = reinterpret_cast(const_cast(in.data.data() + *in_bytes_read)); m_stream.next_in = in_ptr; - m_stream.avail_in = clamped_cast(in.bytes_written - *in_bytes_read); + m_stream.avail_in = MathUtil::SaturatingCast(in.bytes_written - *in_bytes_read); char* const out_ptr = reinterpret_cast(out->data.data() + out->bytes_written); m_stream.next_out = out_ptr; - m_stream.avail_out = clamped_cast(out->data.size() - out->bytes_written); + m_stream.avail_out = MathUtil::SaturatingCast(out->data.size() - out->bytes_written); const int result = BZ2_bzDecompress(&m_stream);