mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 00:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RPNG) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-08-22 17:37:34 +02:00
parent f4432acd06
commit 503131de66
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libretro-common/formats/png/rpng.c
View File

@ -126,6 +126,16 @@ struct rpng
bool has_trns;
};
static const struct adam7_pass passes[] = {
{ 0, 0, 8, 8 },
{ 4, 0, 8, 8 },
{ 0, 4, 4, 8 },
{ 2, 0, 4, 4 },
{ 0, 2, 2, 4 },
{ 1, 0, 2, 2 },
{ 0, 1, 1, 2 },
};
static INLINE uint32_t dword_be(const uint8_t *buf)
{
return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | (buf[3] << 0);
@ -388,10 +398,8 @@ static void png_reverse_filter_copy_line_plt(uint32_t *data,
}
if (width & 1)
{
*data = palette[*decoded >> 4];
}
}
break;
case 8:
@ -399,10 +407,8 @@ static void png_reverse_filter_copy_line_plt(uint32_t *data,
unsigned i;
for (i = 0; i < width; i++, decoded++, data++)
{
*data = palette[*decoded];
}
}
break;
}
}
@ -411,8 +417,8 @@ static void png_pass_geom(const struct png_ihdr *ihdr,
unsigned width, unsigned height,
unsigned *bpp_out, unsigned *pitch_out, size_t *pass_size)
{
unsigned bpp;
unsigned pitch;
unsigned bpp = 0;
unsigned pitch = 0;
switch (ihdr->color_type)
{
@ -437,8 +443,6 @@ static void png_pass_geom(const struct png_ihdr *ihdr,
pitch = (ihdr->width * ihdr->depth * 4 + 7) / 8;
break;
default:
bpp = 0;
pitch = 0;
break;
}
@ -484,16 +488,6 @@ static void png_reverse_filter_deinit(struct rpng_process *pngp)
pngp->h = 0;
}
static const struct adam7_pass passes[] = {
{ 0, 0, 8, 8 },
{ 4, 0, 8, 8 },
{ 0, 4, 4, 8 },
{ 2, 0, 4, 4 },
{ 0, 2, 2, 4 },
{ 1, 0, 2, 2 },
{ 0, 1, 1, 2 },
};
static int png_reverse_filter_init(const struct png_ihdr *ihdr,
struct rpng_process *pngp)
{