yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-12 15:05:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

pcx: fix support of bytes_per_line

Browse source 
https://github.com/yquake2/yquake2/issues/1119
This commit is contained in:
Denis Pauk 2024-07-06 14:16:45 +03:00
parent 50de5e091a
commit c5841b7c2f
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/client/vid/image.c
View file

@ -139,13 +139,12 @@ PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
int *width, int *height)
{
pcx_t *pcx;
int x, y, full_size;
int dataByte, runLength;
int y, full_size, bpl, xmax, ymax, xmin, ymin, xsize, ysize;
byte *out, *pix;
*pic = NULL;
if (len < sizeof(pcx_t))
if (len < (sizeof(pcx_t) + 768))
{
return;
}
@ -162,7 +161,21 @@ PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
return;
}
full_size = (pcx->ymax + 1) * (pcx->xmax + 1);
bpl = LittleShort(pcx->bytes_per_line);
xmax = LittleShort(pcx->xmax);
ymax = LittleShort(pcx->ymax);
xmin = LittleShort(pcx->xmin);
ymin = LittleShort(pcx->ymin);
/* get real size of image */
xsize = xmax - xmin + 1;
ysize = ymax - ymin + 1;
/* fix bpl */
if (bpl < xsize)
{
bpl = xsize;
}
full_size = ysize * bpl;
out = malloc(full_size);
*pic = out;
@ -177,18 +190,22 @@ PCX_Decode(const byte *raw, int len, byte **pic, byte **palette,
if (width)
{
*width = pcx->xmax + 1;
*width = xsize;
}
if (height)
{
*height = pcx->ymax + 1;
*height = ysize;
}
for (y = 0; y <= pcx->ymax; y++, pix += pcx->xmax + 1)
for (y = 0; y < ysize; y++, pix += xsize)
{
for (x = 0; x <= pcx->xmax; )
int x;
for (x = 0; x < bpl; )
{
int dataByte, runLength;
dataByte = *raw++;
if ((dataByte & 0xC0) == 0xC0)