From d5a1edba09f95b868c03879a4c05ffef9a3d80d8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Mar 2018 12:16:08 -0400 Subject: [PATCH] HiresTextures: Remove unnecessary pointer casts in GenBaseName() swap16 has an overload that accepts a u8*, performing the same behavior in a well-defined manner. --- Source/Core/VideoCommon/HiresTextures.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 6362636387..9df399365f 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -243,10 +243,11 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co } break; case 16384 * 2: - for (size_t i = 0; i < texture_size / 2; i++) + for (size_t i = 0; i < texture_size; i += sizeof(u16)) { - min = std::min(min, Common::swap16(((u16*)texture)[i]) & 0x3fff); - max = std::max(max, Common::swap16(((u16*)texture)[i]) & 0x3fff); + const u16 texture_halfword = Common::swap16(texture[i]) & 0x3fff; + min = std::min(min, texture_halfword); + max = std::max(max, texture_halfword); } break; }