(RPNG) rpng_t - Create userdata/ptr

This commit is contained in:
twinaphex 2015-02-21 02:13:20 +01:00
parent 3867a63344
commit 65ea11f7be
2 changed files with 10 additions and 8 deletions

View File

@ -322,23 +322,23 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
unsigned *width, unsigned *height)
{
size_t file_len;
struct nbio_t* nbread = NULL;
struct rpng_t rpng = {0};
bool ret = true;
void* ptr = NULL;
struct nbio_t* nbread = (struct nbio_t*)rpng.userdata;
{
bool looped = false;
nbread = nbio_open(path, NBIO_READ);
ptr = nbio_get_ptr(nbread, &file_len);
rpng.ptr = nbio_get_ptr(nbread, &file_len);
nbio_begin_read(nbread);
while (!nbio_iterate(nbread)) looped=true;
ptr = nbio_get_ptr(nbread, &file_len);
(void)ptr;
while (!nbio_iterate(nbread))
looped=true;
rpng.ptr = nbio_get_ptr(nbread, &file_len);
(void)looped;
rpng.buff_data = (uint8_t*)ptr;
rpng.buff_data = (uint8_t*)rpng.ptr;
}
{
@ -377,7 +377,7 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
width, height);
end:
nbio_free(nbread);
nbio_free((struct nbio_t*)rpng.userdata);
if (!ret)
free(*data);
if (rpng.idat_buf.data)

View File

@ -65,6 +65,8 @@ struct rpng_t
size_t inflate_buf_size;
uint8_t *buff_data;
uint32_t palette[256];
void *userdata;
void *ptr;
};
bool rpng_load_image_argb(const char *path, uint32_t **data,