mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create png_reverse_filter_init/png_reverse_filter_deinit

Browse Source
This commit is contained in:
twinaphex 2015-02-26 07:30:13 +01:00
parent dda9d41d43
commit de95f0cc1d
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libretro-common/formats/png/rpng_decode_common.h
View File

@ -89,13 +89,23 @@ static void deinterlace_pass(uint32_t *data, const struct png_ihdr *ihdr,
}
}
static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
static void png_reverse_filter_deinit(struct rpng_process_t *pngp)
{
if (pngp->decoded_scanline)
free(pngp->decoded_scanline);
pngp->decoded_scanline = NULL;
if (pngp->prev_scanline)
free(pngp->prev_scanline);
pngp->prev_scanline = NULL;
pngp->pass_initialized = false;
}
static bool png_reverse_filter_init(uint32_t *data, const struct png_ihdr *ihdr,
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
const uint32_t *palette)
{
unsigned i;
size_t pass_size;
bool ret = true;
png_pass_geom(ihdr, ihdr->width, ihdr->height, &pngp->bpp, &pngp->pitch, &pass_size);
@ -106,9 +116,28 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
pngp->decoded_scanline = (uint8_t*)calloc(1, pngp->pitch);
if (!pngp->prev_scanline || !pngp->decoded_scanline)
GOTO_END_ERROR();
goto error;
pngp->h = 0;
pngp->pass_initialized = true;
return true;
error:
png_reverse_filter_deinit(pngp);
return false;
}
static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
const uint32_t *palette)
{
unsigned i;
bool ret = true;
if (!pngp->pass_initialized)
if (!png_reverse_filter_init(data, ihdr, inflate_buf, pngp, palette))
return false;
for (; pngp->h < ihdr->height;
pngp->h++, inflate_buf += pngp->pitch, data += ihdr->width)
@ -175,8 +204,7 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
}
end:
free(pngp->decoded_scanline);
free(pngp->prev_scanline);
png_reverse_filter_deinit(pngp);
return ret;
}

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

@ -63,6 +63,7 @@ struct png_ihdr
struct rpng_process_t
{
bool pass_initialized;
uint8_t *prev_scanline;
uint8_t *decoded_scanline;
uint8_t *inflate_buf;