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

Move header code outside of load_image_argb_init

Browse Source
This commit is contained in:
twinaphex 2015-02-20 03:12:09 +01:00
parent d32593adc4
commit a227a99c6c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#endif #endif
//#define NONBLOCKING_TEST #define NONBLOCKING_TEST
static const uint8_t png_magic[8] = { static const uint8_t png_magic[8] = {
0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a, 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a,
@ -777,7 +777,6 @@ static bool rpng_load_image_argb_init(FILE *file,
unsigned *width, unsigned *height, unsigned *width, unsigned *height,
long *file_len) long *file_len)
{ {
char header[8];
*data = NULL; *data = NULL;
*width = 0; *width = 0;
@ -787,11 +786,6 @@ static bool rpng_load_image_argb_init(FILE *file,
*file_len = ftell(file); *file_len = ftell(file);
rewind(file); rewind(file);
if (fread(header, 1, sizeof(header), file) != sizeof(header))
return false;
if (memcmp(header, png_magic, sizeof(png_magic)) != 0)
return false;
return true; return true;
} }
@ -833,6 +827,20 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!rpng_load_image_argb_init(file, data, width, height, &file_len)) if (!rpng_load_image_argb_init(file, data, width, height, &file_len))
GOTO_END_ERROR(); GOTO_END_ERROR();
{
char header[8];
#ifdef NONBLOCKING_TEST
/* TODO/FIXME */
#else
if (fread(header, 1, sizeof(header), file) != sizeof(header))
return false;
if (memcmp(header, png_magic, sizeof(png_magic)) != 0)
return false;
#endif
}
/* feof() apparently isn't triggered after a seek (IEND). */ /* feof() apparently isn't triggered after a seek (IEND). */
for (pos = 0; pos < file_len && pos >= 0; pos = ftell(file)) for (pos = 0; pos < file_len && pos >= 0; pos = ftell(file))