mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RPNG) Simplify png_process_ihdr

Browse Source
This commit is contained in:
twinaphex 2020-08-22 16:28:50 +02:00
parent c7cf9d6df7
commit d6f22a7a4c
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libretro-common/formats/png/rpng.c
View File

@ -134,13 +134,14 @@ static INLINE uint32_t dword_be(const uint8_t *buf)
static bool png_process_ihdr(struct png_ihdr *ihdr)
{
unsigned i;
uint8_t ihdr_depth = ihdr->depth;
switch (ihdr->color_type)
{
case PNG_IHDR_COLOR_RGB:
case PNG_IHDR_COLOR_GRAY_ALPHA:
case PNG_IHDR_COLOR_RGBA:
if (ihdr->depth != 8 && ihdr->depth != 16)
if (ihdr_depth != 8 && ihdr_depth != 16)
{
#ifdef DEBUG
fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__);
@ -149,50 +150,24 @@ static bool png_process_ihdr(struct png_ihdr *ihdr)
}
break;
case PNG_IHDR_COLOR_GRAY:
{
static const unsigned valid_bpp[] = { 1, 2, 4, 8, 16 };
bool correct_bpp = false;
for (i = 0; i < ARRAY_SIZE(valid_bpp); i++)
{
if (valid_bpp[i] == ihdr->depth)
{
correct_bpp = true;
break;
}
}
if (!correct_bpp)
/* Valid bitdepths are: 1, 2, 4, 8, 16 */
if (ihdr_depth > 16 || (0x977F7FFF << ihdr_depth) & 0x80000000)
{
#ifdef DEBUG
fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__);
#endif
return false;
}
}
break;
case PNG_IHDR_COLOR_PLT:
{
static const unsigned valid_bpp[] = { 1, 2, 4, 8 };
bool correct_bpp = false;
for (i = 0; i < ARRAY_SIZE(valid_bpp); i++)
{
if (valid_bpp[i] == ihdr->depth)
{
correct_bpp = true;
break;
}
}
if (!correct_bpp)
/* Valid bitdepths are: 1, 2, 4, 8 */
if (ihdr_depth > 8 || (0x977F7FFF << ihdr_depth) & 0x80000000)
{
#ifdef DEBUG
fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__);
#endif
return false;
}
}
break;
default:
#ifdef DEBUG
@ -204,7 +179,7 @@ static bool png_process_ihdr(struct png_ihdr *ihdr)
#ifdef RPNG_TEST
fprintf(stderr, "IHDR: (%u x %u), bpc = %u, palette = %s, color = %s, alpha = %s, adam7 = %s.\n",
ihdr->width, ihdr->height,
ihdr->depth, (ihdr->color_type == PNG_IHDR_COLOR_PLT) ? "yes" : "no",
ihdr_depth, (ihdr->color_type == PNG_IHDR_COLOR_PLT) ? "yes" : "no",
(ihdr->color_type & PNG_IHDR_COLOR_RGB) ? "yes" : "no",
(ihdr->color_type & PNG_IHDR_COLOR_GRAY_ALPHA) ? "yes" : "no",
ihdr->interlace == 1 ? "yes" : "no");