mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_NONBLOCKING_TEST to image_rpng.c

Browse Source
This commit is contained in:
twinaphex 2015-02-21 04:10:33 +01:00
parent 6c54e8119e
commit 75ba64f391
1 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gfx/image/image_rpng.c
View File

@ -27,6 +27,12 @@
#include "../../general.h" #include "../../general.h"
#include <formats/rpng.h> #include <formats/rpng.h>
//#define HAVE_NONBLOCKING_TEST
#ifdef HAVE_NONBLOCKING_TEST
#include <file/nbio.h>
#endif
static bool rtga_image_load_shift(uint8_t *buf, static bool rtga_image_load_shift(uint8_t *buf,
struct texture_image *out_img, struct texture_image *out_img,
unsigned a_shift, unsigned r_shift, unsigned a_shift, unsigned r_shift,
@ -95,13 +101,70 @@ static bool rtga_image_load_shift(uint8_t *buf,
} }
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#ifdef HAVE_NONBLOCKING_TEST
static bool rpng_load_image_argb_nonblocking(
const char *path, uint32_t **data,
unsigned *width, unsigned *height)
{
bool ret = true;
struct rpng_t *rpng = rpng_nbio_load_image_argb_init(path);
if (!rpng)
{
ret = false;
goto end;
}
while (!nbio_iterate((struct nbio_t*)rpng->userdata));
if (!rpng_nbio_load_image_argb_start(rpng))
{
ret = false;
goto end;
}
while (rpng_nbio_load_image_argb_iterate(
rpng->buff_data, rpng))
{
rpng->buff_data += 4 + 4 + rpng->chunk.size + 4;
}
#if 0
fprintf(stderr, "has_ihdr: %d\n", rpng->has_ihdr);
fprintf(stderr, "has_idat: %d\n", rpng->has_idat);
fprintf(stderr, "has_iend: %d\n", rpng->has_iend);
#endif
if (!rpng->has_ihdr || !rpng->has_idat || !rpng->has_iend)
{
ret = false;
goto end;
}
rpng_nbio_load_image_argb_process(rpng, data, width, height);
end:
rpng_nbio_load_image_free(rpng);
rpng = NULL;
if (!ret)
free(*data);
return ret;
}
#endif
static bool rpng_image_load_argb_shift(const char *path, static bool rpng_image_load_argb_shift(const char *path,
struct texture_image *out_img, struct texture_image *out_img,
unsigned a_shift, unsigned r_shift, unsigned a_shift, unsigned r_shift,
unsigned g_shift, unsigned b_shift) unsigned g_shift, unsigned b_shift)
{ {
#ifdef HAVE_NONBLOCKING_TEST
bool ret = rpng_load_image_argb_nonblocking(path,
&out_img->pixels, &out_img->width, &out_img->height);
#else
bool ret = rpng_load_image_argb(path, bool ret = rpng_load_image_argb(path,
&out_img->pixels, &out_img->width, &out_img->height); &out_img->pixels, &out_img->width, &out_img->height);
#endif
if (!ret) if (!ret)
return false; return false;