Merge pull request #1424 from cxd4/master

Start to simplify the RPNG interface.
This commit is contained in:
Twinaphex 2015-02-19 22:40:14 +01:00
commit 218c71751d

View File

@ -768,8 +768,8 @@ bool rpng_load_image_argb_process(uint8_t *inflate_buf,
return true;
}
bool rpng_load_image_argb_init(FILE *file,
const char *path, uint32_t **data,
static bool rpng_load_image_argb_init(FILE *file,
uint32_t **data,
unsigned *width, unsigned *height,
long *file_len)
{
@ -813,8 +813,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
GOTO_END_ERROR();
}
if (!rpng_load_image_argb_init(file, path,
data, width, height, &file_len))
if (!rpng_load_image_argb_init(file, data, width, height, &file_len))
GOTO_END_ERROR();
/* feof() apparently isn't triggered after a seek (IEND). */