stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-02 22:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

tRNS chunk fix

Browse source 
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
This commit is contained in:
Jaime Ita Passos 2021-01-27 19:23:04 -03:00
parent 29b6bd5df9
commit 4891611ab7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/r_picformats.c
View file

@ -979,8 +979,8 @@ static png_bytep *PNG_Read(
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
{ {
UINT32 rgb = R_PutRgbaRGBA(pal->red, pal->green, pal->blue, 0xFF); byteColor_t *curpal = &(pMasterPalette[i].s);
if (rgb != pMasterPalette[i].rgba) if (pal->red != curpal->red || pal->green != curpal->green || pal->blue != curpal->blue)
{ {
usepal = false; usepal = false;
break; break;
@ -996,12 +996,12 @@ static png_bytep *PNG_Read(
{ {
png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values); png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values);
if (trans && trans_num == 256) if (trans && trans_num > 0)
{ {
INT32 i; INT32 i;
for (i = 0; i < trans_num; i++) for (i = 0; i < trans_num; i++)
{ {
// libpng will transform this image into RGB even if // libpng will transform this image into RGBA even if
// the transparent index does not exist in the image, // the transparent index does not exist in the image,
// and there is no way around that. // and there is no way around that.
if (trans[i] < 0xFF) if (trans[i] < 0xFF)