yuzu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2025-01-08 06:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where the defaulted value caused a crash (wtf?)

Browse source
This commit is contained in:
Pavel Krajcevski 2013-08-30 19:08:53 -04:00
parent 012d9e3ce0
commit 53a8c8e3cd
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
PVRTCEncoder/src/Pixel.cpp
View file

@ -60,11 +60,17 @@ namespace PVRTCC {
void Pixel::FromBits(const uint8 *bits,
const uint8 channelDepth[4],
uint8 bitOffset) {
memcpy(m_BitDepth, channelDepth, sizeof(m_BitDepth));
if(channelDepth) {
memcpy(m_BitDepth, channelDepth, sizeof(m_BitDepth));
} else {
for(int i = 0; i < 4; i++) {
m_BitDepth[i] = 8;
}
}
uint32 nBits = bitOffset;
for(uint32 i = 0; i < 4; i++) {
nBits += channelDepth[i];
nBits += m_BitDepth[i];
}
const uint32 nBytes = (nBits >> 3) + ((nBits & 0x7) > 0);
@ -80,7 +86,7 @@ namespace PVRTCC {
for(int32 i = 3; i >= 0; i--) {
uint8 &channel = m_Component[i];
uint32 depth = channelDepth[i];
uint32 depth = m_BitDepth[i];
assert(depth <= 8);