yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

images: pcx add support 2/4 bits in single plane

Browse source
This commit is contained in:
Denis Pauk 2024-07-15 00:23:20 +03:00
parent d8f754f003
commit 2e32da65bd
1 changed files with 110 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,7 +259,8 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
*height = pcx_height + 1; *height = pcx_height + 1;
} }
if (pcx->color_planes == 3 && pcx->bits_per_pixel == 8) if ((pcx->color_planes == 3 || pcx->color_planes == 4)
&& pcx->bits_per_pixel == 8)
{ {
int x, y; int x, y;
byte *line; byte *line;
@ -270,6 +271,9 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
image_issues = true; image_issues = true;
} }
/* clean image alpha */
memset(pix, 255, full_size);
line = malloc(pcx->bytes_per_line * pcx->color_planes); line = malloc(pcx->bytes_per_line * pcx->color_planes);
for (y = 0; y <= pcx_height; y++, pix += (pcx_width + 1) * 4) for (y = 0; y <= pcx_height; y++, pix += (pcx_width + 1) * 4)
@ -279,53 +283,17 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
pcx->bytes_per_line * pcx->color_planes); pcx->bytes_per_line * pcx->color_planes);
for (x = 0; x <= pcx_width; x++) { for (x = 0; x <= pcx_width; x++) {
pix[4 * x + 0] = line[x]; int j;
pix[4 * x + 1] = line[x + pcx->bytes_per_line];
pix[4 * x + 2] = line[x + pcx->bytes_per_line * 2]; for (j = 0; j < pcx->color_planes; j++)
pix[4 * x + 3] = 255; {
pix[4 * x + j] = line[x + pcx->bytes_per_line * j];
}
} }
} }
free(line); free(line);
} }
else if (pcx->color_planes == 1 && pcx->bits_per_pixel == 8)
{
int y;
if (pcx->bytes_per_line <= pcx_width)
{
pcx->bytes_per_line = pcx_width + 1;
image_issues = true;
}
if (palette)
{
*palette = malloc(768);
if (!(*palette))
{
Com_Printf("%s: Can't allocate for %s\n", __func__, name);
free(out);
return;
}
if ((len > 768) && (((byte *)pcx)[len - 769] == 0x0C))
{
memcpy(*palette, (byte *)pcx + len - 768, 768);
}
else
{
image_issues = true;
}
}
for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1)
{
raw = PCX_RLE_Decode(pix, pix + pcx_width + 1,
raw, (byte *)pcx + len,
pcx->bytes_per_line);
}
}
else if (pcx->bits_per_pixel == 1) else if (pcx->bits_per_pixel == 1)
{ {
byte *line; byte *line;
@ -355,7 +323,7 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
raw, (byte *)pcx + len, raw, (byte *)pcx + len,
pcx->bytes_per_line * pcx->color_planes); pcx->bytes_per_line * pcx->color_planes);
for (x = 0; x < pcx_width + 1; x++) for (x = 0; x <= pcx_width; x++)
{ {
int m, i, v; int m, i, v;
@ -364,18 +332,112 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
for (i = pcx->color_planes - 1; i >= 0; i--) { for (i = pcx->color_planes - 1; i >= 0; i--) {
v <<= 1; v <<= 1;
v += !!(line[i * pcx->bytes_per_line + (x >> 3)] & m); v += (line[i * pcx->bytes_per_line + (x >> 3)] & m) ? 1 : 0;
} }
pix[x] = v; pix[x] = v;
} }
} }
free(line); free(line);
} }
else if (pcx->color_planes == 1 &&
(pcx->bits_per_pixel == 2 ||
pcx->bits_per_pixel == 4 ||
pcx->bits_per_pixel == 8))
{
if (pcx->bits_per_pixel == 8)
{
int y;
if (palette)
{
*palette = malloc(768);
if (!(*palette))
{
Com_Printf("%s: Can't allocate for %s\n", __func__, name);
free(out);
return;
}
if ((len > 768) && (((byte *)pcx)[len - 769] == 0x0C))
{
memcpy(*palette, (byte *)pcx + len - 768, 768);
}
else
{
image_issues = true;
}
}
if (pcx->bytes_per_line <= pcx_width)
{
pcx->bytes_per_line = pcx_width + 1;
image_issues = true;
}
for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1)
{
raw = PCX_RLE_Decode(pix, pix + pcx_width + 1,
raw, (byte *)pcx + len,
pcx->bytes_per_line);
}
}
else
{
int y;
byte *line;
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);
for (y = 0; y <= pcx_height; y++, pix += pcx_width + 1)
{
int x, mask, div;
raw = PCX_RLE_Decode(line, line + pcx->bytes_per_line,
raw, (byte *)pcx + len,
pcx->bytes_per_line);
mask = (1 << pcx->bits_per_pixel) - 1;
div = 8 / pcx->bits_per_pixel;
for (x = 0; x <= pcx_width; x++)
{
unsigned v, shift;
v = line[x / div] & 0xFF;
/* for 2 bits:
* 0 -> 6
* 1 -> 4
* 3 -> 2
* 4 -> 0
*/
shift = pcx->bits_per_pixel * ((div - 1) - x % div);
pix[x] = (v >> shift) & mask;
}
}
free(line);
}
}
else else
{ {
Com_Printf("%s: Bad pcx file %s: planes: %d, bits: %d, palete %d -> %dx%d\n", Com_Printf("%s: Bad pcx file %s: planes: %d, bits: %d\n",
__func__, name, pcx->color_planes, pcx->bits_per_pixel, pcx->palette_type, __func__, name, pcx->color_planes, pcx->bits_per_pixel);
pcx_height, pcx_width);
free(*pic); free(*pic);
*pic = NULL; *pic = NULL;
} }