mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RPNG) Start using restore_buf_size

Browse Source
This commit is contained in:
twinaphex 2015-03-13 19:50:00 +01:00
parent 4852773da4
commit adc6e0b139
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,7 +392,7 @@ static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *i
} }
static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr, static bool png_reverse_filter(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) const uint32_t *palette)
{ {
int ret; int ret;
@ -405,10 +405,10 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
if (pngp->h < ihdr->height) if (pngp->h < ihdr->height)
{ {
unsigned filter = *inflate_buf++; unsigned filter = *pngp->inflate_buf++;
pngp->restore_buf_size += 1; pngp->restore_buf_size += 1;
ret = png_reverse_filter_copy_line(data, ret = png_reverse_filter_copy_line(data,
ihdr, inflate_buf, pngp, palette, filter); ihdr, pngp->inflate_buf, pngp, palette, filter);
} }
if (ret == 1 || ret == -1) if (ret == 1 || ret == -1)
@ -418,11 +418,13 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
} }
pngp->h++; pngp->h++;
inflate_buf += pngp->pitch; pngp->inflate_buf += pngp->pitch;
pngp->restore_buf_size += pngp->pitch; pngp->restore_buf_size += pngp->pitch;
data += ihdr->width; data += ihdr->width;
}while(1); }while(1);
pngp->inflate_buf -= pngp->restore_buf_size;
if (ret == 1) if (ret == 1)
return true; return true;
return false; return false;
@ -453,7 +455,7 @@ static int png_reverse_filter_adam7(uint32_t *data,
} }
if (!png_reverse_filter(pngp->data, if (!png_reverse_filter(pngp->data,
&pngp->ihdr, pngp->inflate_buf, pngp, palette)) &pngp->ihdr, pngp, palette))
{ {
free(pngp->data); free(pngp->data);
ret = -1; ret = -1;
@ -506,7 +508,7 @@ static bool png_reverse_filter_loop(struct rpng_t *rpng,
return false; return false;
} }
else if (!png_reverse_filter(*data, else if (!png_reverse_filter(*data,
&rpng->ihdr, rpng->process.inflate_buf, &rpng->process, rpng->palette)) &rpng->ihdr, &rpng->process, rpng->palette))
return false; return false;
return true; return true;