yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

images: pcx single bit per plane

Browse source 
based on https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/libavcodec/pcx.c
This commit is contained in:
Denis Pauk 2024-07-14 15:28:16 +03:00
parent 5d5e01e1e1
commit d8f754f003
1 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -224,9 +224,7 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
if ((pcx->manufacturer != 0x0a) || if ((pcx->manufacturer != 0x0a) ||
(pcx->version != 5) || (pcx->version != 5) ||
(pcx->encoding != 1) || (pcx->encoding != 1))
((pcx->color_planes != 1) && (pcx->color_planes != 3)) ||
(pcx->bits_per_pixel != 8))
{ {
Com_Printf("%s: Bad pcx file %s: version: %d:%d, encoding: %d\n", Com_Printf("%s: Bad pcx file %s: version: %d:%d, encoding: %d\n",
__func__, name, pcx->manufacturer, pcx->version, pcx->encoding); __func__, name, pcx->manufacturer, pcx->version, pcx->encoding);
@ -311,7 +309,7 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
return; return;
} }
if (len > 768) if ((len > 768) && (((byte *)pcx)[len - 769] == 0x0C))
{ {
memcpy(*palette, (byte *)pcx + len - 768, 768); memcpy(*palette, (byte *)pcx + len - 768, 768);
} }
@ -328,6 +326,59 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
pcx->bytes_per_line); pcx->bytes_per_line);
} }
} }
else if (pcx->bits_per_pixel == 1)
{
byte *line;
int y;
if (palette)
{
*palette = malloc(768);
if (!(*palette))
{
Com_Printf("%s: Can't allocate for %s\n", __func__, name);
free(out);
return;
}
memcpy(*palette, pcx->palette, sizeof(pcx->palette));
}
line = malloc(pcx->bytes_per_line * pcx->color_planes);
for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1)
{
int x;
raw = PCX_RLE_Decode(line, line + pcx->bytes_per_line * pcx->color_planes,
raw, (byte *)pcx + len,
pcx->bytes_per_line * pcx->color_planes);
for (x = 0; x < pcx_width + 1; x++)
{
int m, i, v;
m = 0x80 >> (x & 7);
v = 0;
for (i = pcx->color_planes - 1; i >= 0; i--) {
v <<= 1;
v += !!(line[i * pcx->bytes_per_line + (x >> 3)] & m);
}
pix[x] = v;
}
}
free(line);
}
else
{
Com_Printf("%s: Bad pcx file %s: planes: %d, bits: %d, palete %d -> %dx%d\n",
__func__, name, pcx->color_planes, pcx->bits_per_pixel, pcx->palette_type,
pcx_height, pcx_width);
free(*pic);
*pic = NULL;
}
if (raw - (byte *)pcx > len) if (raw - (byte *)pcx > len)
{ {
@ -572,6 +623,7 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
byte *raw; byte *raw;
ext = COM_FileExtension(filename); ext = COM_FileExtension(filename);
*pic = NULL;
/* load the file */ /* load the file */
len = FS_LoadFile(filename, (void **)&raw); len = FS_LoadFile(filename, (void **)&raw);
@ -587,8 +639,6 @@ VID_ImageDecode(const char *filename, byte **pic, byte **palette,
return; return;
} }
*pic = NULL;
ident = LittleShort(*((short*)raw)); ident = LittleShort(*((short*)raw));
if (!strcmp(ext, "pcx") && (ident == PCX_IDENT)) if (!strcmp(ext, "pcx") && (ident == PCX_IDENT))
{ {