ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RPNG) Create shared png_process_ihdr - both FBIO and FNBIO use it

This commit is contained in:
twinaphex 2015-03-14 00:35:08 +01:00
parent 1902c92ad5
commit 53a788f95a
3 changed files with 86 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libretro-common/formats/png/rpng_decode_common.h
View File

@ -46,6 +46,75 @@ static enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
return PNG_CHUNK_NOOP; return PNG_CHUNK_NOOP;
} }
static bool png_process_ihdr(struct png_ihdr *ihdr)
{
unsigned i;
bool ret = true;
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)
GOTO_END_ERROR();
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)
GOTO_END_ERROR();
}
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)
GOTO_END_ERROR();
}
break;
default:
GOTO_END_ERROR();
}
#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->color_type & PNG_IHDR_COLOR_RGB ? "yes" : "no",
ihdr->color_type & PNG_IHDR_COLOR_GRAY_ALPHA ? "yes" : "no",
ihdr->interlace == 1 ? "yes" : "no");
#endif
if (ihdr->compression != 0)
GOTO_END_ERROR();
end:
return ret;
}
static void png_reverse_filter_copy_line_rgb(uint32_t *data, static void png_reverse_filter_copy_line_rgb(uint32_t *data,
const uint8_t *decoded, unsigned width, unsigned bpp) const uint8_t *decoded, unsigned width, unsigned bpp)
{ {

82
libretro-common/formats/png/rpng_decode_fbio.c
View File

@ -85,7 +85,7 @@ static bool png_parse_ihdr_fio(FILE *file,
return false; return false;
if (chunk->size != 13) if (chunk->size != 13)
GOTO_END_ERROR(); return false;
ihdr->width = dword_be(chunk->data + 0); ihdr->width = dword_be(chunk->data + 0);
ihdr->height = dword_be(chunk->data + 4); ihdr->height = dword_be(chunk->data + 4);
@ -96,76 +96,9 @@ static bool png_parse_ihdr_fio(FILE *file,
ihdr->interlace = chunk->data[12]; ihdr->interlace = chunk->data[12];
if (ihdr->width == 0 || ihdr->height == 0) if (ihdr->width == 0 || ihdr->height == 0)
GOTO_END_ERROR(); return false;
switch (ihdr->color_type) return true;
{
case PNG_IHDR_COLOR_RGB:
case PNG_IHDR_COLOR_GRAY_ALPHA:
case PNG_IHDR_COLOR_RGBA:
if (ihdr->depth != 8 && ihdr->depth != 16)
GOTO_END_ERROR();
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)
GOTO_END_ERROR();
}
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)
GOTO_END_ERROR();
}
break;
default:
GOTO_END_ERROR();
}
#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->color_type & PNG_IHDR_COLOR_RGB ? "yes" : "no",
ihdr->color_type & PNG_IHDR_COLOR_GRAY_ALPHA ? "yes" : "no",
ihdr->interlace == 1 ? "yes" : "no");
#endif
if (ihdr->compression != 0)
GOTO_END_ERROR();
#if 0
if (ihdr->interlace != 0) /* No Adam7 supported. */
GOTO_END_ERROR();
#endif
end:
png_free_chunk(chunk);
return ret;
} }
static bool png_append_idat_fio(FILE *file, static bool png_append_idat_fio(FILE *file,
@ -262,7 +195,16 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
GOTO_END_ERROR(); GOTO_END_ERROR();
if (!png_parse_ihdr_fio(file, &chunk, &rpng.ihdr)) if (!png_parse_ihdr_fio(file, &chunk, &rpng.ihdr))
{
png_free_chunk(&chunk);
GOTO_END_ERROR(); GOTO_END_ERROR();
}
if (!png_process_ihdr(&rpng.ihdr))
{
png_free_chunk(&chunk);
GOTO_END_ERROR();
}
rpng.has_ihdr = true; rpng.has_ihdr = true;
break; break;

74
libretro-common/formats/png/rpng_decode_fnbio.c
View File

@ -56,7 +56,6 @@ static bool read_chunk_header(uint8_t *buf, struct png_chunk *chunk)
static bool png_parse_ihdr(uint8_t *buf, static bool png_parse_ihdr(uint8_t *buf,
struct png_ihdr *ihdr) struct png_ihdr *ihdr)
{ {
unsigned i;
bool ret = true; bool ret = true;
buf += 4 + 4; buf += 4 + 4;
@ -70,75 +69,9 @@ static bool png_parse_ihdr(uint8_t *buf,
ihdr->interlace = buf[12]; ihdr->interlace = buf[12];
if (ihdr->width == 0 || ihdr->height == 0) if (ihdr->width == 0 || ihdr->height == 0)
GOTO_END_ERROR(); return false;
switch (ihdr->color_type) return true;
{
case PNG_IHDR_COLOR_RGB:
case PNG_IHDR_COLOR_GRAY_ALPHA:
case PNG_IHDR_COLOR_RGBA:
if (ihdr->depth != 8 && ihdr->depth != 16)
GOTO_END_ERROR();
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)
GOTO_END_ERROR();
}
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)
GOTO_END_ERROR();
}
break;
default:
GOTO_END_ERROR();
}
#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->color_type & PNG_IHDR_COLOR_RGB ? "yes" : "no",
ihdr->color_type & PNG_IHDR_COLOR_GRAY_ALPHA ? "yes" : "no",
ihdr->interlace == 1 ? "yes" : "no");
#endif
if (ihdr->compression != 0)
GOTO_END_ERROR();
#if 0
if (ihdr->interlace != 0) /* No Adam7 supported. */
GOTO_END_ERROR();
#endif
end:
return ret;
} }
static bool png_realloc_idat(const struct png_chunk *chunk, struct idat_buffer *buf) static bool png_realloc_idat(const struct png_chunk *chunk, struct idat_buffer *buf)
@ -209,6 +142,9 @@ bool rpng_nbio_load_image_argb_iterate(uint8_t *buf, struct rpng_t *rpng)
if (!png_parse_ihdr(buf, &rpng->ihdr)) if (!png_parse_ihdr(buf, &rpng->ihdr))
return false; return false;
if (!png_process_ihdr(&rpng->ihdr))
return false;
rpng->has_ihdr = true; rpng->has_ihdr = true;
break; break;