libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 08:59:58 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(PNG) Refactor process code some more

Browse Source
This commit is contained in:
twinaphex 2015-02-25 10:25:14 +01:00
parent 1e2a91fca7
commit fbed3cfd27
3 changed files with 50 additions and 22 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

@ -89,11 +89,11 @@ 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 bool png_reverse_filter_init(uint32_t *data, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp)
{
unsigned i;
bool ret = true;
if (ihdr->interlace == 1)
return true;
png_pass_geom(ihdr, ihdr->width, ihdr->height, &pngp->bpp, &pngp->pitch, &pngp->pass_size);
@ -104,9 +104,22 @@ 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();
{
free(pngp->decoded_scanline);
free(pngp->prev_scanline);
return false;
}
for (pngp->h = 0; pngp->h < ihdr->height;
return true;
}
static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
struct rpng_process_t *pngp)
{
unsigned i;
bool ret = true;
for (; pngp->h < ihdr->height;
pngp->h++, pngp->inflate_buf += pngp->pitch, data += ihdr->width)
{
unsigned filter = *pngp->inflate_buf++;
@ -173,8 +186,10 @@ static bool png_reverse_filter(uint32_t *data, const struct png_ihdr *ihdr,
}
end:
free(pngp->decoded_scanline);
free(pngp->prev_scanline);
if (pngp->decoded_scanline)
free(pngp->decoded_scanline);
if (pngp->prev_scanline)
free(pngp->prev_scanline);
return ret;
}
@ -192,7 +207,7 @@ static bool png_reverse_filter_adam7(uint32_t *data,
{ 0, 1, 1, 2 },
};
for (pngp->pass = 0; pngp->pass < ARRAY_SIZE(passes); pngp->pass++)
for (; pngp->pass < ARRAY_SIZE(passes); pngp->pass++)
{
unsigned pass_width, pass_height;
struct png_ihdr tmp_ihdr;

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

@ -215,7 +215,7 @@ bool rpng_load_image_argb(const char *path, uint32_t **data,
char header[8];
z_stream stream = {0};
struct rpng_t rpng = {0};
struct rpng_process_t process = {0};
struct rpng_process_t pngp = {0};
bool ret = true;
*data = NULL;
@ -338,18 +338,23 @@ 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.palette = rpng.palette;
pngp.total_out = stream.total_out;
pngp.inflate_buf = rpng.inflate_buf;
pngp.palette = rpng.palette;
pngp.pass = 0;
pngp.h = 0;
png_reverse_filter_init(*data, &rpng.ihdr,
&pngp);
if (rpng.ihdr.interlace == 1)
{
if (!png_reverse_filter_adam7(*data,
&rpng.ihdr, &process))
&rpng.ihdr, &pngp))
GOTO_END_ERROR();
}
else if (!png_reverse_filter(*data,
&rpng.ihdr, &process))
&rpng.ihdr, &pngp))
GOTO_END_ERROR();
end:

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

@ -257,7 +257,7 @@ 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,
uint32_t **data, unsigned *width, unsigned *height)
{
struct rpng_process_t process = {0};
struct rpng_process_t pngp = {0};
z_stream stream = {0};
if (inflateInit(&stream) != Z_OK)
@ -297,19 +297,27 @@ 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.palette = rpng->palette;
pngp.total_out = stream.total_out;
pngp.inflate_buf = rpng->inflate_buf;
pngp.palette = rpng->palette;
pngp.pass = 0;
pngp.h = 0;
png_reverse_filter_init(*data, &rpng->ihdr,
&pngp);
if (rpng->ihdr.interlace == 1)
{
if (!png_reverse_filter_adam7(*data,
&rpng->ihdr, &process))
&rpng->ihdr, &pngp))
return false;
}
else
{
if (!png_reverse_filter(*data,
&rpng->ihdr, &pngp))
return false;
}
else if (!png_reverse_filter(*data,
&rpng->ihdr, &process))
return false;
return true;
}