TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove useless casts in d2x-rebirth/libmve/decoder8.cpp

Browse source
This commit is contained in:
Kp 2016-08-17 04:44:22 +00:00
parent 4b92942bb6
commit cb99240c2c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d2x-rebirth/libmve/decoder8.cpp
View file

@ -29,14 +29,14 @@ void decodeFrame8(unsigned char *pFrame, const unsigned char *pMap, int mapRemai
for (int i=0; i<xb/2; i++)
{
dispatchDecoder(&pFrame, (*pMap) & 0xf, &pData, &dataRemain, &i, &j);
if (pFrame < reinterpret_cast<uint8_t *>(g_vBackBuf1))
if (pFrame < g_vBackBuf1)
con_printf(CON_CRITICAL, "danger! pointing out of bounds below after dispatch decoder: %d, %d (1) [%x]", i, j, (*pMap) & 0xf);
else if (pFrame >= (reinterpret_cast<uint8_t *>(g_vBackBuf1)) + g_width*g_height)
else if (pFrame >= g_vBackBuf1 + g_width*g_height)
con_printf(CON_CRITICAL, "danger! pointing out of bounds above after dispatch decoder: %d, %d (1) [%x]", i, j, (*pMap) & 0xf);
dispatchDecoder(&pFrame, (*pMap) >> 4, &pData, &dataRemain, &i, &j);
if (pFrame < reinterpret_cast<uint8_t *>(g_vBackBuf1))
if (pFrame < g_vBackBuf1)
con_printf(CON_CRITICAL, "danger! pointing out of bounds below after dispatch decoder: %d, %d (2) [%x]", i, j, (*pMap) >> 4);
else if (pFrame >= (reinterpret_cast<uint8_t *>(g_vBackBuf1)) + g_width*g_height)
else if (pFrame >= g_vBackBuf1 + g_width*g_height)
con_printf(CON_CRITICAL, "danger! pointing out of bounds above after dispatch decoder: %d, %d (2) [%x]", i, j, (*pMap) >> 4);
++pMap;
@ -229,7 +229,7 @@ static void dispatchDecoder(unsigned char **pFrame, unsigned char codeType, cons
{
case 0x0:
/* block is copied from block in current frame */
copyFrame(*pFrame, *pFrame + (reinterpret_cast<uint8_t *>(g_vBackBuf2) - reinterpret_cast<uint8_t *>(g_vBackBuf1)));
copyFrame(*pFrame, *pFrame + (g_vBackBuf2 - g_vBackBuf1));
case 0x1:
/* block is unchanged from two frames ago */
*pFrame += 8;
@ -287,7 +287,7 @@ static void dispatchDecoder(unsigned char **pFrame, unsigned char codeType, cons
y = -8 + BH
*/
relClose(*(*pData)++, &x, &y);
copyFrame(*pFrame, *pFrame + (reinterpret_cast<uint8_t *>(g_vBackBuf2) - reinterpret_cast<uint8_t *>(g_vBackBuf1)) + x + y*g_width);
copyFrame(*pFrame, *pFrame + (g_vBackBuf2 - g_vBackBuf1) + x + y*g_width);
*pFrame += 8;
--*pDataRemain;
break;
@ -300,7 +300,7 @@ static void dispatchDecoder(unsigned char **pFrame, unsigned char codeType, cons
*/
x = (signed char)*(*pData)++;
y = (signed char)*(*pData)++;
copyFrame(*pFrame, *pFrame + (reinterpret_cast<uint8_t *>(g_vBackBuf2) - reinterpret_cast<uint8_t *>(g_vBackBuf1)) + x + y*g_width);
copyFrame(*pFrame, *pFrame + (g_vBackBuf2 - g_vBackBuf1) + x + y*g_width);
*pFrame += 8;
*pDataRemain -= 2;
break;