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

pcx: show developer warning for uncommon pcx files

Browse source 
https://github.com/yquake2/yquake2/pull/1130#issuecomment-2259254531
This commit is contained in:
Denis Pauk 2024-07-31 10:54:37 +03:00
parent 9e303a8044
commit f6e8aeab38
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/cl_image.c
View file

@ -141,7 +141,8 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
} }
full_size = (pcx_height + 1) * (pcx_width + 1); full_size = (pcx_height + 1) * (pcx_width + 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)
{ {
full_size *= 4; full_size *= 4;
*bitsPerPixel = 32; *bitsPerPixel = 32;
@ -351,6 +352,13 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
*pic = NULL; *pic = NULL;
} }
if (pcx->color_planes != 1 || pcx->bits_per_pixel != 8)
{
Com_DPrintf("%s: %s has uncommon flags, "
"could be unsupported by other engines\n",
__func__, name);
}
if (data - (byte *)pcx > len) if (data - (byte *)pcx > len)
{ {
Com_DPrintf("%s: %s file was malformed\n", __func__, name); Com_DPrintf("%s: %s file was malformed\n", __func__, name);

10
src/client/refresh/files/pcx.c
View file

@ -216,7 +216,8 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
} }
full_size = (pcx_height + 1) * (pcx_width + 1); full_size = (pcx_height + 1) * (pcx_width + 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)
{ {
full_size *= 4; full_size *= 4;
*bitsPerPixel = 32; *bitsPerPixel = 32;
@ -426,6 +427,13 @@ PCX_Decode(const char *name, const byte *raw, int len, byte **pic, byte **palett
*pic = NULL; *pic = NULL;
} }
if (pcx->color_planes != 1 || pcx->bits_per_pixel != 8)
{
R_Printf(PRINT_DEVELOPER, "%s: %s has uncommon flags, "
"could be unsupported by other engines\n",
__func__, name);
}
if (data - (byte *)pcx > len) if (data - (byte *)pcx > len)
{ {
R_Printf(PRINT_DEVELOPER, "%s: %s file was malformed\n", R_Printf(PRINT_DEVELOPER, "%s: %s file was malformed\n",