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

(RPNG) Restore inflate_buf to previous state at end of adam7 loop

Browse Source
This commit is contained in:
twinaphex 2015-03-13 18:45:55 +01:00
parent 87933f1ff3
commit ccb106580e
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,27 +427,33 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
static int png_reverse_filter_adam7(uint32_t *data,
const struct png_ihdr *ihdr,
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
struct rpng_process_t *pngp,
const uint32_t *palette)
{
int ret = 0;
for (; pngp->pass.pos < ARRAY_SIZE(passes); pngp->pass.pos++)
{
int ret = png_reverse_filter_init(ihdr, inflate_buf, pngp, palette);
int ret = png_reverse_filter_init(ihdr, pngp->inflate_buf, pngp, palette);
if (ret == 1)
continue;
if (ret == -1)
return -1;
if (!png_reverse_filter(pngp->data,
&pngp->ihdr, inflate_buf, pngp, palette))
{
free(pngp->data);
return -1;
ret = -1;
goto end;
}
inflate_buf += pngp->pass.size;
if (!png_reverse_filter(pngp->data,
&pngp->ihdr, pngp->inflate_buf, pngp, palette))
{
free(pngp->data);
ret = -1;
goto end;
}
pngp->inflate_buf += pngp->pass.size;
pngp->restore_buf_size += pngp->pass.size;
pngp->stream.total_out -= pngp->pass.size;
deinterlace_pass(data,
@ -461,7 +467,10 @@ static int png_reverse_filter_adam7(uint32_t *data,
pngp->adam7_pass_initialized = false;
}
return 0;
end:
pngp->inflate_buf -= pngp->restore_buf_size;
return ret;
}
static bool png_reverse_filter_loop(struct rpng_t *rpng,
@ -470,7 +479,7 @@ static bool png_reverse_filter_loop(struct rpng_t *rpng,
if (rpng->ihdr.interlace == 1)
{
int ret = png_reverse_filter_adam7(*data,
&rpng->ihdr, rpng->process.inflate_buf, &rpng->process, rpng->palette);
&rpng->ihdr, &rpng->process, rpng->palette);
if (ret == -1)
return false;
}

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

@ -70,6 +70,7 @@ struct rpng_process_t
uint8_t *prev_scanline;
uint8_t *decoded_scanline;
uint8_t *inflate_buf;
size_t restore_buf_size;
size_t inflate_buf_size;
unsigned bpp;
unsigned pitch;