mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 15:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename RPNG functions

Browse Source
This commit is contained in:
twinaphex 2016-05-13 09:49:38 +02:00
parent 1623d538d5
commit fa27a8447e
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/video_texture_image.c
View File

@ -174,18 +174,18 @@ static bool video_texture_image_load_png(
if (!rpng_set_buf_ptr(rpng, (uint8_t*)ptr)) if (!rpng_set_buf_ptr(rpng, (uint8_t*)ptr))
goto end; goto end;
if (!rpng_nbio_load_image_argb_start(rpng)) if (!rpng_start(rpng))
goto end; goto end;
while (rpng_nbio_load_image_argb_iterate(rpng)); while (rpng_iterate_image(rpng));
if (!rpng_is_valid(rpng)) if (!rpng_is_valid(rpng))
goto end; goto end;
do do
{ {
ret = rpng_nbio_load_image_argb_process(rpng, ret = rpng_process_image(rpng,
(void**)&out_img->pixels, &out_img->width, (void**)&out_img->pixels, 0, &out_img->width,
&out_img->height); &out_img->height);
}while(ret == IMAGE_PROCESS_NEXT); }while(ret == IMAGE_PROCESS_NEXT);
@ -207,7 +207,7 @@ static bool video_texture_image_load_png(
end: end:
if (rpng) if (rpng)
rpng_nbio_load_image_free(rpng); rpng_free(rpng);
return success; return success;
} }

10
libretro-common/formats/image_transfer.c
View File

@ -25,7 +25,7 @@ void image_transfer_free(void *data, enum image_type_enum type)
{ {
case IMAGE_TYPE_PNG: case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
rpng_nbio_load_image_free((rpng_t*)data); rpng_free((rpng_t*)data);
#endif #endif
break; break;
case IMAGE_TYPE_JPEG: case IMAGE_TYPE_JPEG:
@ -73,7 +73,7 @@ bool image_transfer_start(void *data, enum image_type_enum type)
{ {
case IMAGE_TYPE_PNG: case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
if (!rpng_nbio_load_image_argb_start((rpng_t*)data)) if (!rpng_start((rpng_t*)data))
return false; return false;
#endif #endif
break; break;
@ -123,9 +123,9 @@ int image_transfer_process(
if (!rpng_is_valid((rpng_t*)data)) if (!rpng_is_valid((rpng_t*)data))
return IMAGE_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
return rpng_nbio_load_image_argb_process( return rpng_process_image(
(rpng_t*)data, (rpng_t*)data,
(void**)buf, width, height); (void**)buf, len, width, height);
#else #else
break; break;
#endif #endif
@ -154,7 +154,7 @@ bool image_transfer_iterate(void *data, enum image_type_enum type)
{ {
case IMAGE_TYPE_PNG: case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
if (!rpng_nbio_load_image_argb_iterate((rpng_t*)data)) if (!rpng_iterate_image((rpng_t*)data))
return false; return false;
#endif #endif
break; break;

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

@ -844,7 +844,7 @@ static bool png_parse_ihdr(uint8_t *buf,
return true; return true;
} }
bool rpng_nbio_load_image_argb_iterate(rpng_t *rpng) bool rpng_iterate_image(rpng_t *rpng)
{ {
unsigned i; unsigned i;
struct png_chunk chunk = {0}; struct png_chunk chunk = {0};
@ -942,11 +942,13 @@ error:
return false; return false;
} }
int rpng_nbio_load_image_argb_process(rpng_t *rpng, int rpng_process_image(rpng_t *rpng,
void **_data, unsigned *width, unsigned *height) void **_data, size_t size, unsigned *width, unsigned *height)
{ {
uint32_t **data = (uint32_t**)_data; uint32_t **data = (uint32_t**)_data;
(void)size;
if (!rpng->process.initialized) if (!rpng->process.initialized)
{ {
if (!rpng->process.stream_backend) if (!rpng->process.stream_backend)
@ -970,7 +972,7 @@ int rpng_nbio_load_image_argb_process(rpng_t *rpng,
return png_reverse_filter_iterate(rpng, data); return png_reverse_filter_iterate(rpng, data);
} }
void rpng_nbio_load_image_free(rpng_t *rpng) void rpng_free(rpng_t *rpng)
{ {
if (!rpng) if (!rpng)
return; return;
@ -988,7 +990,7 @@ void rpng_nbio_load_image_free(rpng_t *rpng)
free(rpng); free(rpng);
} }
bool rpng_nbio_load_image_argb_start(rpng_t *rpng) bool rpng_start(rpng_t *rpng)
{ {
unsigned i; unsigned i;
char header[8] = {0}; char header[8] = {0};

12
libretro-common/include/formats/rpng.h
View File

@ -35,7 +35,7 @@ RETRO_BEGIN_DECLS
typedef struct rpng rpng_t; typedef struct rpng rpng_t;
rpng_t *rpng_nbio_load_image_argb_init(const char *path); rpng_t *rpng_init(const char *path);
bool rpng_is_valid(rpng_t *rpng); bool rpng_is_valid(rpng_t *rpng);
@ -43,14 +43,14 @@ bool rpng_set_buf_ptr(rpng_t *rpng, void *data);
rpng_t *rpng_alloc(void); rpng_t *rpng_alloc(void);
void rpng_nbio_load_image_free(rpng_t *rpng); void rpng_free(rpng_t *rpng);
bool rpng_nbio_load_image_argb_iterate(rpng_t *rpng); bool rpng_iterate_image(rpng_t *rpng);
int rpng_nbio_load_image_argb_process(rpng_t *rpng, int rpng_process_image(rpng_t *rpng,
void **data, unsigned *width, unsigned *height); void **data, size_t size, unsigned *width, unsigned *height);
bool rpng_nbio_load_image_argb_start(rpng_t *rpng); bool rpng_start(rpng_t *rpng);
#ifdef HAVE_ZLIB_DEFLATE #ifdef HAVE_ZLIB_DEFLATE
bool rpng_save_image_argb(const char *path, const uint32_t *data, bool rpng_save_image_argb(const char *path, const uint32_t *data,