mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RPNG) Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-05-19 01:00:03 +02:00
parent ceb657eba2
commit 033bc60939
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ struct png_chunk
uint8_t *data; uint8_t *data;
}; };
struct rpng_process_t struct rpng_process
{ {
bool inflate_initialized; bool inflate_initialized;
bool adam7_pass_initialized; bool adam7_pass_initialized;
@ -116,7 +116,7 @@ struct rpng_process_t
struct rpng struct rpng
{ {
struct rpng_process_t *process; struct rpng_process *process;
bool has_ihdr; bool has_ihdr;
bool has_idat; bool has_idat;
bool has_iend; bool has_iend;
@ -401,7 +401,7 @@ static void png_reverse_filter_adam7_deinterlace_pass(uint32_t *data,
} }
} }
static void png_reverse_filter_deinit(struct rpng_process_t *pngp) static void png_reverse_filter_deinit(struct rpng_process *pngp)
{ {
if (pngp->decoded_scanline) if (pngp->decoded_scanline)
free(pngp->decoded_scanline); free(pngp->decoded_scanline);
@ -425,7 +425,7 @@ static const struct adam7_pass passes[] = {
}; };
static int png_reverse_filter_init(const struct png_ihdr *ihdr, static int png_reverse_filter_init(const struct png_ihdr *ihdr,
struct rpng_process_t *pngp) struct rpng_process *pngp)
{ {
size_t pass_size; size_t pass_size;
@ -491,7 +491,7 @@ error:
} }
static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *ihdr, static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp, unsigned filter) struct rpng_process *pngp, unsigned filter)
{ {
unsigned i; unsigned i;
@ -561,7 +561,7 @@ static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *i
} }
static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_ihdr *ihdr, static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp) struct rpng_process *pngp)
{ {
int ret = IMAGE_PROCESS_END; int ret = IMAGE_PROCESS_END;
@ -596,7 +596,7 @@ end:
static int png_reverse_filter_adam7_iterate(uint32_t **data_, static int png_reverse_filter_adam7_iterate(uint32_t **data_,
const struct png_ihdr *ihdr, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp) struct rpng_process *pngp)
{ {
int ret = 0; int ret = 0;
bool to_next = pngp->pass.pos < ARRAY_SIZE(passes); bool to_next = pngp->pass.pos < ARRAY_SIZE(passes);
@ -643,7 +643,7 @@ static int png_reverse_filter_adam7_iterate(uint32_t **data_,
static int png_reverse_filter_adam7(uint32_t **data_, static int png_reverse_filter_adam7(uint32_t **data_,
const struct png_ihdr *ihdr, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp) struct rpng_process *pngp)
{ {
int ret = png_reverse_filter_adam7_iterate(data_, int ret = png_reverse_filter_adam7_iterate(data_,
ihdr, pngp); ihdr, pngp);
@ -684,7 +684,7 @@ static int rpng_load_image_argb_process_inflate_init(rpng_t *rpng,
uint32_t **data, unsigned *width, unsigned *height) uint32_t **data, unsigned *width, unsigned *height)
{ {
int zstatus; int zstatus;
struct rpng_process_t *process = (struct rpng_process_t*)rpng->process; struct rpng_process *process = (struct rpng_process*)rpng->process;
bool to_continue = (process->stream_backend->stream_get_avail_in(process->stream) > 0 bool to_continue = (process->stream_backend->stream_get_avail_in(process->stream) > 0
&& process->stream_backend->stream_get_avail_out(process->stream) > 0); && process->stream_backend->stream_get_avail_out(process->stream) > 0);
@ -767,10 +767,10 @@ bool png_realloc_idat(const struct png_chunk *chunk, struct idat_buffer *buf)
return true; return true;
} }
static struct rpng_process_t *rpng_process_init(rpng_t *rpng, static struct rpng_process *rpng_process_init(rpng_t *rpng,
uint32_t **data, unsigned *width, unsigned *height) uint32_t **data, unsigned *width, unsigned *height)
{ {
struct rpng_process_t *process = (struct rpng_process_t*)calloc(1, sizeof(*process)); struct rpng_process *process = (struct rpng_process*)calloc(1, sizeof(*process));
if (!process) if (!process)
goto error; goto error;
@ -955,7 +955,7 @@ int rpng_process_image(rpng_t *rpng,
if (!rpng->process) if (!rpng->process)
{ {
struct rpng_process_t *process = rpng_process_init( struct rpng_process *process = rpng_process_init(
rpng, data, width, height); rpng, data, width, height);
if (!process) if (!process)