ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4657 from lioncash/color 

ColorUtil: Make decodeCI8image's pal parameter const
This commit is contained in:
Matthew Parlane 2017-01-14 11:20:46 +13:00 committed by GitHub
parent 30e57cecf7 45415e1057
commit c8a054d234
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/ColorUtil.cpp
View File

@ -58,7 +58,7 @@ void decode5A3image(u32* dst, const u16* src, int width, int height)
} }
} }
void decodeCI8image(u32* dst, const u8* src, 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) for (int y = 0; y < height; y += 4)
{ {

2
Source/Core/Common/ColorUtil.h
View File

@ -9,6 +9,6 @@
namespace ColorUtil namespace ColorUtil
{ {
void decode5A3image(u32* dst, const u16* src, int width, int height); void decode5A3image(u32* dst, const u16* src, int width, int height);
void decodeCI8image(u32* dst, const u8* src, u16* pal, int width, int height); void decodeCI8image(u32* dst, const u8* src, const u16* pal, int width, int height);
} // namespace } // namespace

9
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -1160,8 +1160,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
} }
} }
u16* sharedPal = (u16*)(animData); const u16* sharedPal = reinterpret_cast<u16*>(animData);
int j = 0;
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
@ -1183,7 +1182,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
buffer += 32 * 32; buffer += 32 * 32;
break; break;
case CI8: // CI8 with own palette case CI8: // CI8 with own palette
u16* paldata = (u16*)(data[i] + 32 * 32); const u16* paldata = reinterpret_cast<u16*>(data[i] + 32 * 32);
ColorUtil::decodeCI8image(buffer, data[i], paldata, 32, 32); ColorUtil::decodeCI8image(buffer, data[i], paldata, 32, 32);
buffer += 32 * 32; buffer += 32 * 32;
break; break;
@ -1194,7 +1193,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
// Speed is set but there's no actual icon // Speed is set but there's no actual icon
// This is used to reduce animation speed in Pikmin and Luigi's Mansion for example // This is used to reduce animation speed in Pikmin and Luigi's Mansion for example
// These "blank frames" show the next icon // These "blank frames" show the next icon
for (j = i; j < 8; ++j) for (int j = i; j < 8; ++j)
{ {
if (fmts[j] != 0) if (fmts[j] != 0)
{ {
@ -1208,7 +1207,7 @@ u32 GCMemcard::ReadAnimRGBA8(u8 index, u32* buffer, u8* delays) const
buffer += 32 * 32; buffer += 32 * 32;
break; break;
case CI8: // CI8 with own palette case CI8: // CI8 with own palette
u16* paldata = (u16*)(data[j] + 32 * 32); const u16* paldata = reinterpret_cast<u16*>(data[j] + 32 * 32);
ColorUtil::decodeCI8image(buffer, data[j], paldata, 32, 32); ColorUtil::decodeCI8image(buffer, data[j], paldata, 32, 32);
buffer += 32 * 32; buffer += 32 * 32;
break; break;