mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Move inflate_buf to rpng_process_t"

Browse Source 
This reverts commit c97096287d7673c10e455560ad8d0f137973ae95.
This commit is contained in:
twinaphex 2015-02-25 21:55:17 +01:00
parent 4770b37273
commit ea99f00016
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ 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,
struct rpng_process_t *pngp,
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
const uint32_t *palette)
{
unsigned i, h;
@ -113,47 +113,47 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
GOTO_END_ERROR();
for (h = 0; h < ihdr->height;
h++, pngp->inflate_buf += pitch, data += ihdr->width)
h++, inflate_buf += pitch, data += ihdr->width)
{
unsigned filter = *pngp->inflate_buf++;
unsigned filter = *inflate_buf++;
switch (filter)
{
case 0: /* None */
memcpy(decoded_scanline, pngp->inflate_buf, pitch);
memcpy(decoded_scanline, inflate_buf, pitch);
break;
case 1: /* Sub */
for (i = 0; i < bpp; i++)
decoded_scanline[i] = pngp->inflate_buf[i];
decoded_scanline[i] = inflate_buf[i];
for (i = bpp; i < pitch; i++)
decoded_scanline[i] = decoded_scanline[i - bpp] + pngp->inflate_buf[i];
decoded_scanline[i] = decoded_scanline[i - bpp] + inflate_buf[i];
break;
case 2: /* Up */
for (i = 0; i < pitch; i++)
decoded_scanline[i] = prev_scanline[i] + pngp->inflate_buf[i];
decoded_scanline[i] = prev_scanline[i] + inflate_buf[i];
break;
case 3: /* Average */
for (i = 0; i < bpp; i++)
{
uint8_t avg = prev_scanline[i] >> 1;
decoded_scanline[i] = avg + pngp->inflate_buf[i];
decoded_scanline[i] = avg + inflate_buf[i];
}
for (i = bpp; i < pitch; i++)
{
uint8_t avg = (decoded_scanline[i - bpp] + prev_scanline[i]) >> 1;
decoded_scanline[i] = avg + pngp->inflate_buf[i];
decoded_scanline[i] = avg + inflate_buf[i];
}
break;
case 4: /* Paeth */
for (i = 0; i < bpp; i++)
decoded_scanline[i] = paeth(0, prev_scanline[i], 0) + pngp->inflate_buf[i];
decoded_scanline[i] = paeth(0, prev_scanline[i], 0) + inflate_buf[i];
for (i = bpp; i < pitch; i++)
decoded_scanline[i] = paeth(decoded_scanline[i - bpp],
prev_scanline[i], prev_scanline[i - bpp]) + pngp->inflate_buf[i];
prev_scanline[i], prev_scanline[i - bpp]) + inflate_buf[i];
break;
default:
@ -184,7 +184,7 @@ end:
static bool png_reverse_filter_adam7(uint32_t *data,
const struct png_ihdr *ihdr,
struct rpng_process_t *pngp,
const uint8_t *inflate_buf, struct rpng_process_t *pngp,
const uint32_t *palette)
{
unsigned pass;
@ -234,14 +234,14 @@ static bool png_reverse_filter_adam7(uint32_t *data,
}
if (!png_reverse_filter(tmp_data,
&tmp_ihdr, pngp, palette))
&tmp_ihdr, inflate_buf, pngp, palette))
{
free(tmp_data);
return false;
}
pngp->inflate_buf += pass_size;
pngp->total_out -= pass_size;
inflate_buf += pass_size;
pngp->total_out -= pass_size;
deinterlace_pass(data,
ihdr, tmp_data, pass_width, pass_height, &passes[pass]);

7
libretro-common/formats/png/rpng_decode_fbio.c
View File

@ -338,17 +338,16 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
if (!*data)
GOTO_END_ERROR();
process.total_out = stream.total_out;
process.inflate_buf = rpng.inflate_buf;
process.total_out = stream.total_out;
if (rpng.ihdr.interlace == 1)
{
if (!png_reverse_filter_adam7(*data,
&rpng.ihdr, &process, rpng.palette))
&rpng.ihdr, rpng.inflate_buf, &process, rpng.palette))
GOTO_END_ERROR();
}
else if (!png_reverse_filter(*data,
&rpng.ihdr, &process, rpng.palette))
&rpng.ihdr, rpng.inflate_buf, &process, rpng.palette))
GOTO_END_ERROR();
end:

7
libretro-common/formats/png/rpng_decode_fnbio.c
View File

@ -297,17 +297,16 @@ bool rpng_nbio_load_image_argb_process(struct rpng_t *rpng,
if (!*data)
return false;
process.total_out = stream.total_out;
process.inflate_buf = rpng->inflate_buf;
process.total_out = stream.total_out;
if (rpng->ihdr.interlace == 1)
{
if (!png_reverse_filter_adam7(*data,
&rpng->ihdr, &process, rpng->palette))
&rpng->ihdr, rpng->inflate_buf, &process, rpng->palette))
return false;
}
else if (!png_reverse_filter(*data,
&rpng->ihdr, &process, rpng->palette))
&rpng->ihdr, rpng->inflate_buf, &process, rpng->palette))
return false;
return true;

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

@ -62,7 +62,6 @@ struct png_ihdr
struct rpng_process_t
{
const uint8_t *inflate_buf;
size_t total_out;
};