zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix newly exposed -Wtautological-constant-out-of-range-compare in kplib

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7558 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-04-10 01:00:42 +00:00 committed by Christoph Oelckers
parent fb0443db69
commit 0d277a6210
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/build/src/kplib.cpp
View file

@ -1261,7 +1261,7 @@ static int32_t kpegrend(const char *kfilebuf, int32_t kfilength,
kfileptr = (uint8_t const *)kfilebuf; kfileptr = (uint8_t const *)kfilebuf;
kfileend = &kfileptr[kfilength]; kfileend = &kfileptr[kfilength];
if (B_UNBUF16(kfileptr) == B_LITTLE16(0xd8ff)) kfileptr += 2; if (B_UNBUF16(kfileptr) == B_LITTLE16(0xD8FFu)) kfileptr += 2;
else return -1; //"%s is not a JPEG file\n",filename else return -1; //"%s is not a JPEG file\n",filename
restartinterval = 0; restartinterval = 0;
@ -2228,7 +2228,7 @@ void kpgetdim(const char *buf, int32_t leng, int32_t *xsiz, int32_t *ysiz)
lptr = (int32_t *)((intptr_t)lptr + B_BIG32(lptr[0]) + 12); lptr = (int32_t *)((intptr_t)lptr + B_BIG32(lptr[0]) + 12);
} }
} }
else if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0xd8ff)) //.JPG else if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0xD8FFu)) //.JPG
{ {
cptr = (uint8_t const *)&buf[2]; cptr = (uint8_t const *)&buf[2];
while (((uintptr_t)cptr-(uintptr_t)buf) < (uintptr_t)(leng-8)) while (((uintptr_t)cptr-(uintptr_t)buf) < (uintptr_t)(leng-8))
@ -2302,7 +2302,7 @@ int32_t kprender(const char *buf, int32_t leng, intptr_t frameptr, int32_t bpl,
if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0x5089)) //.PNG if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0x5089)) //.PNG
return kpngrend(buf,leng,frameptr,bpl,xdim,ydim); return kpngrend(buf,leng,frameptr,bpl,xdim,ydim);
else if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0xd8ff)) //.JPG else if (B_UNBUF16(&ubuf[0]) == B_LITTLE16(0xD8FFu)) //.JPG
return kpegrend(buf,leng,frameptr,bpl,xdim,ydim); return kpegrend(buf,leng,frameptr,bpl,xdim,ydim);
else else
{ {