diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index 60d9b5b084..b6258fb5ce 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -40,7 +40,7 @@ static u32 Decode5A3(u16 val) return (a << 24) | (r << 16) | (g << 8) | b; } -void decode5A3image(u32* dst, const u16* src, int width, int height) +void Decode5A3Image(u32* dst, const u16* src, int width, int height) { for (int y = 0; y < height; y += 4) { @@ -58,7 +58,7 @@ void decode5A3image(u32* dst, const u16* src, int width, int height) } } -void decodeCI8image(u32* dst, const u8* src, const u16* pal, int width, int height) +void DecodeCI8Image(u32* dst, const u8* src, const u16* pal, int width, int height) { for (int y = 0; y < height; y += 4) { diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h index 14486a97d7..be277a20e6 100644 --- a/Source/Core/Common/ColorUtil.h +++ b/Source/Core/Common/ColorUtil.h @@ -8,6 +8,6 @@ namespace Common { -void decode5A3image(u32* dst, const u16* src, int width, int height); -void decodeCI8image(u32* dst, const u8* src, const u16* pal, int width, int height); +void Decode5A3Image(u32* dst, const u16* src, int width, int height); +void DecodeCI8Image(u32* dst, const u8* src, const u16* pal, int width, int height); } // namespace Common diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp index d31126bac1..cf0ff40331 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp @@ -1082,13 +1082,13 @@ bool GCMemcard::ReadBannerRGBA8(u8 index, u32* buffer) const u8* pxdata = (u8*)(mc_data_blocks[DataBlock].block + DataOffset); u16* paldata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset + pixels); - Common::decodeCI8image(buffer, pxdata, paldata, 96, 32); + Common::DecodeCI8Image(buffer, pxdata, paldata, 96, 32); } else { u16* pxdata = (u16*)(mc_data_blocks[DataBlock].block + DataOffset); - Common::decode5A3image(buffer, pxdata, 96, 32); + Common::Decode5A3Image(buffer, pxdata, 96, 32); } return true; } @@ -1182,16 +1182,16 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const switch (fmts[i]) { case CI8SHARED: // CI8 with shared palette - Common::decodeCI8image(buffer, data[i], sharedPal, 32, 32); + Common::DecodeCI8Image(buffer, data[i], sharedPal, 32, 32); buffer += 32 * 32; break; case RGB5A3: // RGB5A3 - Common::decode5A3image(buffer, (u16*)(data[i]), 32, 32); + Common::Decode5A3Image(buffer, (u16*)(data[i]), 32, 32); buffer += 32 * 32; break; case CI8: // CI8 with own palette const u16* paldata = reinterpret_cast(data[i] + 32 * 32); - Common::decodeCI8image(buffer, data[i], paldata, 32, 32); + Common::DecodeCI8Image(buffer, data[i], paldata, 32, 32); buffer += 32 * 32; break; } @@ -1208,15 +1208,15 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const switch (fmts[j]) { case CI8SHARED: // CI8 with shared palette - Common::decodeCI8image(buffer, data[j], sharedPal, 32, 32); + Common::DecodeCI8Image(buffer, data[j], sharedPal, 32, 32); break; case RGB5A3: // RGB5A3 - Common::decode5A3image(buffer, (u16*)(data[j]), 32, 32); + Common::Decode5A3Image(buffer, (u16*)(data[j]), 32, 32); buffer += 32 * 32; break; case CI8: // CI8 with own palette const u16* paldata = reinterpret_cast(data[j] + 32 * 32); - Common::decodeCI8image(buffer, data[j], paldata, 32, 32); + Common::DecodeCI8Image(buffer, data[j], paldata, 32, 32); buffer += 32 * 32; break; } diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 51f9d0bb23..d48e00ac9d 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -244,7 +244,7 @@ VolumeGC::ConvertedGCBanner VolumeGC::ExtractBannerInformation(const GCBanner& b banner.image_width = GC_BANNER_WIDTH; banner.image_height = GC_BANNER_HEIGHT; banner.image_buffer = std::vector(GC_BANNER_WIDTH * GC_BANNER_HEIGHT); - Common::decode5A3image(banner.image_buffer.data(), banner_file.image, GC_BANNER_WIDTH, + Common::Decode5A3Image(banner.image_buffer.data(), banner_file.image, GC_BANNER_WIDTH, GC_BANNER_HEIGHT); for (u32 i = 0; i < number_of_languages; ++i) diff --git a/Source/Core/DiscIO/WiiSaveBanner.cpp b/Source/Core/DiscIO/WiiSaveBanner.cpp index 5cd87e335c..aa53ad8183 100644 --- a/Source/Core/DiscIO/WiiSaveBanner.cpp +++ b/Source/Core/DiscIO/WiiSaveBanner.cpp @@ -69,7 +69,7 @@ std::vector WiiSaveBanner::GetBanner(u32* width, u32* height) const return std::vector(); std::vector image_buffer(BANNER_WIDTH * BANNER_HEIGHT); - Common::decode5A3image(image_buffer.data(), banner_data.data(), BANNER_WIDTH, BANNER_HEIGHT); + Common::Decode5A3Image(image_buffer.data(), banner_data.data(), BANNER_WIDTH, BANNER_HEIGHT); *width = BANNER_WIDTH; *height = BANNER_HEIGHT;