yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2024-12-02 22:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix small crash bug

Browse Source
This commit is contained in:
Pavel Krajcevski 2014-08-26 13:44:09 -04:00
parent edfc6bde78
commit 995eacd5b6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BPTCEncoder/src/CompressNVTT.cpp
View File

@ -112,17 +112,16 @@ namespace BPTCC {
uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz; uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz;
uint32 startX = cj.XStart(); uint32 startX = cj.XStart();
bool done = false; const uint32 endY = std::min(cj.YEnd(), cj.Height() - 4);
for(uint32 j = cj.YStart(); j <= endY; j += 4) {
for(uint32 j = cj.YStart(); !done; j += 4) { const uint32 endX = j == cj.YEnd()? cj.XEnd() : cj.Width();
for(uint32 i = startX; !done && i < cj.Width(); i += 4) { for(uint32 i = startX; i < endX; i += 4) {
Tile block(4, 4); Tile block(4, 4);
GetBlock(i, j, cj.Width(), inPixels, block); GetBlock(i, j, cj.Width(), inPixels, block);
AVPCL::compress(block, reinterpret_cast<char *>(outBuf), NULL); AVPCL::compress(block, reinterpret_cast<char *>(outBuf), NULL);
outBuf += kBlockSz; outBuf += kBlockSz;
done = i+4 >= cj.XEnd() && j+(i+4 == cj.Width()? 4 : 0) >= cj.YEnd();
} }
startX = 0; startX = 0;
} }
@ -173,9 +172,10 @@ namespace BPTCC {
uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz; uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz;
uint32 startX = cj.XStart(); uint32 startX = cj.XStart();
bool done = false; const uint32 endY = std::min(cj.YEnd(), cj.Height() - 4);
for(uint32 j = cj.YStart(); !done; j += 4) { for(uint32 j = cj.YStart(); j <= endY; j += 4) {
for(uint32 i = startX; !done && i < cj.Width(); i += 4) { const uint32 endX = j == cj.YEnd()? cj.XEnd() : cj.Width();
for(uint32 i = startX; i < endX; i += 4) {
Tile block(4, 4); Tile block(4, 4);
GetBlock(i, j, cj.Width(), inPixels, block); GetBlock(i, j, cj.Width(), inPixels, block);
@ -197,7 +197,6 @@ namespace BPTCC {
} }
outBuf += 16; outBuf += 16;
done = i+4 >= cj.XEnd() && j+(i+4 == cj.Width()? 4 : 0) >= cj.YEnd();
} }
startX = 0; startX = 0;