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

(RPNG) Create rpng_load_image_argb_process_init - cut down on some more

Browse Source 
code duplication
This commit is contained in:
twinaphex 2015-03-14 01:50:45 +01:00
parent bfaddc15bd
commit a14850c915
4 changed files with 53 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libretro-common/formats/png/rpng_decode.c
View File

@ -626,3 +626,49 @@ bool png_reverse_filter_loop(struct rpng_t *rpng,
return true; return true;
} }
bool rpng_load_image_argb_process_init(struct rpng_t *rpng,
uint32_t **data, unsigned *width, unsigned *height)
{
rpng->process.inflate_buf_size = 0;
rpng->process.inflate_buf = NULL;
if (inflateInit(&rpng->process.stream) != Z_OK)
return false;
png_pass_geom(&rpng->ihdr, rpng->ihdr.width,
rpng->ihdr.height, NULL, NULL, &rpng->process.inflate_buf_size);
if (rpng->ihdr.interlace == 1) /* To be sure. */
rpng->process.inflate_buf_size *= 2;
rpng->process.inflate_buf = (uint8_t*)malloc(rpng->process.inflate_buf_size);
if (!rpng->process.inflate_buf)
return false;
rpng->process.stream.next_in = rpng->idat_buf.data;
rpng->process.stream.avail_in = rpng->idat_buf.size;
rpng->process.stream.avail_out = rpng->process.inflate_buf_size;
rpng->process.stream.next_out = rpng->process.inflate_buf;
if (inflate(&rpng->process.stream, Z_FINISH) != Z_STREAM_END)
{
inflateEnd(&rpng->process.stream);
return false;
}
inflateEnd(&rpng->process.stream);
*width = rpng->ihdr.width;
*height = rpng->ihdr.height;
#ifdef GEKKO
/* we often use these in textures, make sure they're 32-byte aligned */
*data = (uint32_t*)memalign(32, rpng->ihdr.width *
rpng->ihdr.height * sizeof(uint32_t));
#else
*data = (uint32_t*)malloc(rpng->ihdr.width *
rpng->ihdr.height * sizeof(uint32_t));
#endif
if (!*data)
return false;
return true;
}

3
libretro-common/formats/png/rpng_decode.h
View File

@ -45,4 +45,7 @@ int png_reverse_filter_regular_loop(uint32_t **data,
bool png_reverse_filter_loop(struct rpng_t *rpng, bool png_reverse_filter_loop(struct rpng_t *rpng,
uint32_t **data); uint32_t **data);
bool rpng_load_image_argb_process_init(struct rpng_t *rpng,
uint32_t **data, unsigned *width, unsigned *height);
#endif #endif

34
libretro-common/formats/png/rpng_fbio.c
View File

@ -257,38 +257,8 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!rpng.has_ihdr || !rpng.has_idat || !rpng.has_iend) if (!rpng.has_ihdr || !rpng.has_idat || !rpng.has_iend)
GOTO_END_ERROR(); GOTO_END_ERROR();
if (inflateInit(&rpng.process.stream) != Z_OK) if (!rpng_load_image_argb_process_init(&rpng, data, width,
GOTO_END_ERROR(); height))
png_pass_geom(&rpng.ihdr, rpng.ihdr.width, rpng.ihdr.height, NULL, NULL, &rpng.process.inflate_buf_size);
if (rpng.ihdr.interlace == 1) /* To be sure. */
rpng.process.inflate_buf_size *= 2;
rpng.process.inflate_buf = (uint8_t*)malloc(rpng.process.inflate_buf_size);
if (!rpng.process.inflate_buf)
GOTO_END_ERROR();
rpng.process.stream.next_in = rpng.idat_buf.data;
rpng.process.stream.avail_in = rpng.idat_buf.size;
rpng.process.stream.avail_out = rpng.process.inflate_buf_size;
rpng.process.stream.next_out = rpng.process.inflate_buf;
if (inflate(&rpng.process.stream, Z_FINISH) != Z_STREAM_END)
{
inflateEnd(&rpng.process.stream);
GOTO_END_ERROR();
}
inflateEnd(&rpng.process.stream);
*width = rpng.ihdr.width;
*height = rpng.ihdr.height;
#ifdef GEKKO
/* we often use these in textures, make sure they're 32-byte aligned */
*data = (uint32_t*)memalign(32, rpng.ihdr.width * rpng.ihdr.height * sizeof(uint32_t));
#else
*data = (uint32_t*)malloc(rpng.ihdr.width * rpng.ihdr.height * sizeof(uint32_t));
#endif
if (!*data)
GOTO_END_ERROR(); GOTO_END_ERROR();
if (!png_reverse_filter_loop(&rpng, data)) if (!png_reverse_filter_loop(&rpng, data))

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

@ -194,47 +194,8 @@ bool rpng_nbio_load_image_argb_iterate(uint8_t *buf, struct rpng_t *rpng)
bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng, bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng,
uint32_t **data, unsigned *width, unsigned *height) uint32_t **data, unsigned *width, unsigned *height)
{ {
if (!rpng) if (!rpng_load_image_argb_process_init(rpng, data, width,
return false; height))
rpng->process.inflate_buf_size = 0;
rpng->process.inflate_buf = NULL;
if (inflateInit(&rpng->process.stream) != Z_OK)
return false;
png_pass_geom(&rpng->ihdr, rpng->ihdr.width,
rpng->ihdr.height, NULL, NULL, &rpng->process.inflate_buf_size);
if (rpng->ihdr.interlace == 1) /* To be sure. */
rpng->process.inflate_buf_size *= 2;
rpng->process.inflate_buf = (uint8_t*)malloc(rpng->process.inflate_buf_size);
if (!rpng->process.inflate_buf)
return false;
rpng->process.stream.next_in = rpng->idat_buf.data;
rpng->process.stream.avail_in = rpng->idat_buf.size;
rpng->process.stream.avail_out = rpng->process.inflate_buf_size;
rpng->process.stream.next_out = rpng->process.inflate_buf;
if (inflate(&rpng->process.stream, Z_FINISH) != Z_STREAM_END)
{
inflateEnd(&rpng->process.stream);
return false;
}
inflateEnd(&rpng->process.stream);
*width = rpng->ihdr.width;
*height = rpng->ihdr.height;
#ifdef GEKKO
/* we often use these in textures, make sure they're 32-byte aligned */
*data = (uint32_t*)memalign(32, rpng->ihdr.width *
rpng->ihdr.height * sizeof(uint32_t));
#else
*data = (uint32_t*)malloc(rpng->ihdr.width *
rpng->ihdr.height * sizeof(uint32_t));
#endif
if (!*data)
return false; return false;
if (!png_reverse_filter_loop(rpng, data)) if (!png_reverse_filter_loop(rpng, data))