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

Merge branch 'trns-chunk-fix' into 'next'

Browse source 
tRNS chunk fix

See merge request STJr/SRB2!1393
This commit is contained in:
sphere 2021-05-19 06:07:38 -04:00
commit dc5572ba21
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

@ -983,8 +983,8 @@ static png_bytep *PNG_Read(
for (i = 0; i < 256; i++)
{
UINT32 rgb = R_PutRgbaRGBA(pal->red, pal->green, pal->blue, 0xFF);
if (rgb != pMasterPalette[i].rgba)
byteColor_t *curpal = &(pMasterPalette[i].s);
if (pal->red != curpal->red || pal->green != curpal->green || pal->blue != curpal->blue)
{
usepal = false;
break;
@ -1000,12 +1000,12 @@ static png_bytep *PNG_Read(
{
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;
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,
// and there is no way around that.
if (trans[i] < 0xFF)