From 4891611ab73a7ec60119bfee84d5a164b3127611 Mon Sep 17 00:00:00 2001
From: Jaime Ita Passos <jp6781615@gmail.com>
Date: Wed, 27 Jan 2021 19:23:04 -0300
Subject: [PATCH] tRNS chunk fix Fixes a faulty check not properly detecting
the presence of a tRNS chunk.
---
src/r_picformats.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/r_picformats.c b/src/r_picformats.c
index f87362c76e..ac9747426c 100644
--- a/src/r_picformats.c
+++ b/src/r_picformats.c
@@ -979,8 +979,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;
@@ -996,12 +996,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)
--
GitLab