mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-25 16:18:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Brad Svercl 2021-01-15 23:47:16 -06:00
commit d477d31182
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/images/aseprite.cpp
View File

@ -308,8 +308,7 @@ void Aseprite::parse_palette(Stream& stream, int frame)
for (int p = 0, len = static_cast<int>(end - start) + 1; p < len; p++) for (int p = 0, len = static_cast<int>(end - start) + 1; p < len; p++)
{ {
auto hasName = stream.read<uint16_t>(Endian::Little); auto hasName = stream.read<uint16_t>(Endian::Little);
palette[start + p] = stream.read<uint32_t>(Endian::Little);
palette[start + p] = stream.read<Color>(Endian::Little);
if (hasName & 0xF000) if (hasName & 0xF000)
{ {
@ -334,7 +333,7 @@ void Aseprite::parse_user_data(Stream& stream, int frame)
// has color // has color
if (flags & (1 << 1)) if (flags & (1 << 1))
m_last_userdata->color = stream.read<Color>(Endian::Little); m_last_userdata->color = stream.read<uint32_t>(Endian::Little);
} }
} }