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

Move inflate_buf_size and palette to rpng_t

Browse Source
This commit is contained in:
twinaphex 2015-02-21 02:04:30 +01:00
parent 193fef41cc
commit 7c80d7e1d0
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,9 +213,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
long pos, file_len;
FILE *file;
char header[8];
size_t inflate_buf_size = 0;
z_stream stream = {0};
uint32_t palette[256] = {0};
struct rpng_t rpng = {0};
bool ret = true;
@ -274,7 +272,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (chunk.size % 3)
GOTO_END_ERROR();
if (!png_read_plte_fio(file, palette, chunk.size / 3))
if (!png_read_plte_fio(file, rpng.palette, chunk.size / 3))
GOTO_END_ERROR();
rpng.has_plte = true;
@ -308,17 +306,17 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (inflateInit(&stream) != Z_OK)
GOTO_END_ERROR();
png_pass_geom(&rpng.ihdr, rpng.ihdr.width, rpng.ihdr.height, NULL, NULL, &inflate_buf_size);
png_pass_geom(&rpng.ihdr, rpng.ihdr.width, rpng.ihdr.height, NULL, NULL, &rpng.inflate_buf_size);
if (rpng.ihdr.interlace == 1) /* To be sure. */
inflate_buf_size *= 2;
rpng.inflate_buf_size *= 2;
rpng.inflate_buf = (uint8_t*)malloc(inflate_buf_size);
rpng.inflate_buf = (uint8_t*)malloc(rpng.inflate_buf_size);
if (!rpng.inflate_buf)
GOTO_END_ERROR();
stream.next_in = rpng.idat_buf.data;
stream.avail_in = rpng.idat_buf.size;
stream.avail_out = inflate_buf_size;
stream.avail_out = rpng.inflate_buf_size;
stream.next_out = rpng.inflate_buf;
if (inflate(&stream, Z_FINISH) != Z_STREAM_END)
@ -342,11 +340,11 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (rpng.ihdr.interlace == 1)
{
if (!png_reverse_filter_adam7(*data,
&rpng.ihdr, rpng.inflate_buf, stream.total_out, palette))
&rpng.ihdr, rpng.inflate_buf, stream.total_out, rpng.palette))
GOTO_END_ERROR();
}
else if (!png_reverse_filter(*data,
&rpng.ihdr, rpng.inflate_buf, stream.total_out, palette))
&rpng.ihdr, rpng.inflate_buf, stream.total_out, rpng.palette))
GOTO_END_ERROR();
end:

14
libretro-common/formats/png/rpng_nbio.c
View File

@ -264,23 +264,22 @@ bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng,
unsigned *width, unsigned *height)
{
z_stream stream = {0};
size_t inflate_buf_size = 0;
if (inflateInit(&stream) != Z_OK)
return false;
png_pass_geom(ihdr, ihdr->width,
ihdr->height, NULL, NULL, &inflate_buf_size);
ihdr->height, NULL, NULL, &rpng->inflate_buf_size);
if (ihdr->interlace == 1) /* To be sure. */
inflate_buf_size *= 2;
rpng->inflate_buf_size *= 2;
rpng->inflate_buf = (uint8_t*)malloc(inflate_buf_size);
rpng->inflate_buf = (uint8_t*)malloc(rpng->inflate_buf_size);
if (!rpng->inflate_buf)
return false;
stream.next_in = rpng->idat_buf.data;
stream.avail_in = rpng->idat_buf.size;
stream.avail_out = inflate_buf_size;
stream.avail_out = rpng->inflate_buf_size;
stream.next_out = rpng->inflate_buf;
if (inflate(&stream, Z_FINISH) != Z_STREAM_END)
@ -319,7 +318,6 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
{
size_t file_len;
struct nbio_t* nbread = NULL;
uint32_t palette[256] = {0};
struct rpng_t rpng = {0};
bool ret = true;
void* ptr = NULL;
@ -359,7 +357,7 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
GOTO_END_ERROR();
if (!rpng_nbio_load_image_argb_iterate(
rpng.buff_data, &chunk, palette, &rpng.ihdr,
rpng.buff_data, &chunk, rpng.palette, &rpng.ihdr,
&rpng))
break;
@ -376,7 +374,7 @@ bool rpng_nbio_load_image_argb(const char *path, uint32_t **data,
GOTO_END_ERROR();
rpng_nbio_load_image_argb_process(&rpng,
&rpng.ihdr, data, palette,
&rpng.ihdr, data, rpng.palette,
width, height);
end:

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

@ -62,7 +62,9 @@ struct rpng_t
struct idat_buffer idat_buf;
struct png_ihdr ihdr;
uint8_t *inflate_buf;
size_t inflate_buf_size;
uint8_t *buff_data;
uint32_t palette[256];
};
bool rpng_load_image_argb(const char *path, uint32_t **data,