CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-23 19:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(MPNG) More cleanups to make it more like rpng

Browse Source
This commit is contained in:
twinaphex 2015-02-17 04:59:39 +01:00
parent b27871664a
commit 9f2c205e54
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libretro-sdk/formats/mpng/mpng_decode.c
View File

@ -20,10 +20,7 @@ static uint16_t word_be(const uint8_t *buf)
return (buf[0] << 16) | (buf[1] << 8) | (buf[2] << 0); return (buf[0] << 16) | (buf[1] << 8) | (buf[2] << 0);
} }
#define read8r(source) (*(source))
#define read8(target, chunkdata) do { target = read8r(chunkdata); chunkdata += 1; } while(0)
#define read24(target, chunkdata) do { target = word_be(chunkdata); chunkdata += 3; } while(0) #define read24(target, chunkdata) do { target = word_be(chunkdata); chunkdata += 3; } while(0)
#define read32(target, chunkdata) do { target = dword_be(chunkdata); chunkdata += 4; } while(0)
enum mpng_chunk_type enum mpng_chunk_type
{ {
@ -45,6 +42,10 @@ struct mpng_ihdr
uint8_t interlace; uint8_t interlace;
}; };
static const uint8_t mpng_magic[8] = {
0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a,
};
struct mpng_chunk struct mpng_chunk
{ {
uint32_t size; uint32_t size;
@ -56,20 +57,20 @@ bool mpng_parse_ihdr(struct mpng_ihdr *ihdr, struct mpng_chunk *chunk,
enum video_format format, unsigned int *bpl, enum video_format format, unsigned int *bpl,
uint8_t *pixels, uint8_t *pixelsat, uint8_t *pixelsend) uint8_t *pixels, uint8_t *pixelsat, uint8_t *pixelsend)
{ {
read32(ihdr->width, chunk->data); ihdr->width = dword_be(chunk->data + 0);
read32(ihdr->height, chunk->data); ihdr->height = dword_be(chunk->data + 4);
read8(ihdr->depth, chunk->data); ihdr->depth = chunk->data[8];
read8(ihdr->color_type, chunk->data); ihdr->color_type = chunk->data[9];
read8(ihdr->compression, chunk->data); ihdr->compression = chunk->data[10];
read8(ihdr->filter, chunk->data); ihdr->filter = chunk->data[11];
read8(ihdr->interlace, chunk->data); ihdr->interlace = chunk->data[12];
if (ihdr->width >= 0x80000000)
return false;
if (ihdr->width == 0 || ihdr->height == 0) if (ihdr->width == 0 || ihdr->height == 0)
return false; return false;
if (ihdr->width >= 0x80000000)
return false;
if (ihdr->height >= 0x80000000) if (ihdr->height >= 0x80000000)
return false; return false;
@ -128,8 +129,8 @@ bool mpng_parse_ihdr(struct mpng_ihdr *ihdr, struct mpng_chunk *chunk,
if (!pixels) if (!pixels)
return false; return false;
pixelsat = pixels; pixelsat = (uint8_t*)pixels;
pixelsend = pixels + (*bpl + 1) * ihdr->height; pixelsend = (uint8_t*)(pixels + (*bpl + 1) * ihdr->height);
return true; return true;
} }
@ -162,10 +163,10 @@ bool png_decode(const void *userdata, size_t len,
if (len < 8) if (len < 8)
return false; return false;
if (memcmp(data, "\x89PNG\r\n\x1A\n", 8)) if (memcmp(data, mpng_magic, sizeof(mpng_magic)) != 0)
return false; return false;
data_end = data + len; data_end = (const uint8_t*)(data + len);
data += 8; data += 8;
memset(palette, 0, sizeof(palette)); memset(palette, 0, sizeof(palette));
@ -560,8 +561,8 @@ bool png_decode(const void *userdata, size_t len,
break; break;
default: default:
if (!(chunk.type & 0x20000000)) if (!(chunk.type & 0x20000000))
goto error;//unknown critical goto error; /* unknown critical */
//otherwise ignore /* otherwise ignore */
} }
} }