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

Create rpng_load_image_argb_init

This commit is contained in:
twinaphex 2015-02-19 15:33:27 +01:00
parent a4c3097cdb
commit 57a04df37f
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,12 +785,34 @@ bool rpng_load_image_argb_process(uint8_t *inflate_buf,
return true; return true;
} }
bool rpng_load_image_argb_init(FILE *file,
const char *path, uint32_t **data,
unsigned *width, unsigned *height,
long *file_len)
{
char header[8];
*data = NULL;
*width = 0;
*height = 0;
fseek(file, 0, SEEK_END);
*file_len = ftell(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;
}
bool rpng_load_image_argb(const char *path, uint32_t **data, bool rpng_load_image_argb(const char *path, uint32_t **data,
unsigned *width, unsigned *height) unsigned *width, unsigned *height)
{ {
long pos, file_len; long pos, file_len;
FILE *file;
char header[8];
uint8_t *inflate_buf = NULL; uint8_t *inflate_buf = NULL;
struct idat_buffer idat_buf = {0}; struct idat_buffer idat_buf = {0};
struct png_ihdr ihdr = {0}; struct png_ihdr ihdr = {0};
@ -800,23 +822,13 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
bool has_iend = false; bool has_iend = false;
bool has_plte = false; bool has_plte = false;
bool ret = true; bool ret = true;
FILE *file = fopen(path, "rb");
*data = NULL;
*width = 0;
*height = 0;
file = fopen(path, "rb");
if (!file) if (!file)
return false; return false;
fseek(file, 0, SEEK_END); if (!rpng_load_image_argb_init(file, path,
file_len = ftell(file); data, width, height, &file_len))
rewind(file);
if (fread(header, 1, sizeof(header), file) != sizeof(header))
GOTO_END_ERROR();
if (memcmp(header, png_magic, sizeof(png_magic)) != 0)
GOTO_END_ERROR(); GOTO_END_ERROR();
pos = ftell(file); pos = ftell(file);