yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-16 17:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

image: move pcx RLE to separate function

Browse source
This commit is contained in:
Denis Pauk 2024-07-11 23:20:52 +03:00
parent 1efc45612c
commit 66da110472
1 changed files with 57 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,19 +134,67 @@ fixQuitScreen(byte* px)
} }
} }
static const byte *
PCX_RLE_Decode(byte *pix, byte *pix_max, const byte *raw, const byte *raw_max, int bytes_per_line)
{
int x;
for (x = 0; x < bytes_per_line; )
{
int runLength;
byte dataByte;
if (raw >= raw_max)
{
// no place for read
return raw;
}
dataByte = *raw++;
if ((dataByte & 0xC0) == 0xC0)
{
runLength = dataByte & 0x3F;
if (raw >= raw_max)
{
// no place for read
return raw;
}
dataByte = *raw++;
}
else
{
runLength = 1;
}
while (runLength-- > 0)
{
if (pix_max <= (pix + x))
{
// no place for write
return raw;
}
else
{
pix[x++] = dataByte;
}
}
}
return raw;
}
static void static void
PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palette, PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palette,
int *width, int *height) int *width, int *height, int *bitesPerPixel)
{ {
pcx_t *pcx; pcx_t *pcx;
int x, y; int y;
int full_size; int full_size;
int pcx_width, pcx_height; int pcx_width, pcx_height;
qboolean image_issues = false; qboolean image_issues = false;
int dataByte, runLength;
byte *out, *pix; byte *out, *pix;
*pic = NULL; *pic = NULL;
*bitesPerPixel = 8;
if (palette) if (palette)
{ {
@ -200,7 +248,7 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
pix = out; pix = out;
if (palette) if (palette && (pcx->color_planes == 1))
{ {
*palette = malloc(768); *palette = malloc(768);
if (!(*palette)) if (!(*palette))
@ -231,49 +279,9 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1) for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1)
{ {
for (x = 0; x < pcx->bytes_per_line; ) raw = PCX_RLE_Decode(pix, pix + pcx_width + 1,
{ raw, (byte *)pcx + len,
if (raw - (byte *)pcx > len) pcx->bytes_per_line);
{
// no place for read
image_issues = true;
x = pcx_width;
break;
}
dataByte = *raw++;
if ((dataByte & 0xC0) == 0xC0)
{
runLength = dataByte & 0x3F;
if (raw - (byte *)pcx > len)
{
// no place for read
image_issues = true;
x = pcx_width;
break;
}
dataByte = *raw++;
}
else
{
runLength = 1;
}
while (runLength-- > 0)
{
if ((*pic + full_size) <= (pix + x))
{
// no place for write
image_issues = true;
x += runLength;
runLength = 0;
}
else
{
pix[x++] = dataByte;
}
}
}
} }
if (raw - (byte *)pcx > len) if (raw - (byte *)pcx > len)
@ -539,10 +547,10 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
ident = LittleShort(*((short*)raw)); ident = LittleShort(*((short*)raw));
if (!strcmp(ext, "pcx") && (ident == PCX_IDENT)) if (!strcmp(ext, "pcx") && (ident == PCX_IDENT))
{ {
PCX_Decode(filename, raw, len, pic, palette, width, height); PCX_Decode(filename, raw, len, pic, palette, width, height, bitesPerPixel);
if(*pic && width && height if(*pic && width && height
&& *width == 319 && *height == 239 && *width == 319 && *height == 239 && *bitesPerPixel == 8
&& Q_strcasecmp(filename, "pics/quit.pcx") == 0 && Q_strcasecmp(filename, "pics/quit.pcx") == 0
&& Com_BlockChecksum(raw, len) == 3329419434u) && Com_BlockChecksum(raw, len) == 3329419434u)
{ {
@ -550,8 +558,6 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
// so fix it // so fix it
fixQuitScreen(*pic); fixQuitScreen(*pic);
} }
*bitesPerPixel = 8;
} }
else if (!strcmp(ext, "m8")) else if (!strcmp(ext, "m8"))
{ {