mirror of
https://github.com/libretro/RetroArch
synced 2025-03-29 22:20:21 +00:00
(mpng_decode.c) Style nits
This commit is contained in:
twinaphex
parent
41403fb3d6
commit
6bb81b59d5
@ -15,7 +15,11 @@ static void tinfl_deinit(tinfl_decompressor* r) {}
|
||||
typedef z_stream tinfl_decompressor;
|
||||
typedef int tinfl_status;
|
||||
|
||||
static uint32_t mz_crc32(uint32_t crc, const uint8_t* buf, size_t len) { return crc32(crc, buf, len); }
|
||||
static uint32_t mz_crc32(uint32_t crc,
|
||||
const uint8_t* buf, size_t len)
|
||||
{
|
||||
return crc32(crc, buf, len);
|
||||
}
|
||||
|
||||
enum {
|
||||
TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
|
||||
@ -26,21 +30,23 @@ enum {
|
||||
TINFL_STATUS_DONE = Z_STREAM_END
|
||||
};
|
||||
|
||||
static void tinfl_init(tinfl_decompressor* r)
|
||||
static void tinfl_init(tinfl_decompressor *r)
|
||||
{
|
||||
memset(r, 0, sizeof(*r));
|
||||
inflateInit(r);
|
||||
}
|
||||
|
||||
static tinfl_status tinfl_decompress(tinfl_decompressor* r, const uint8_t * pIn_buf_next, size_t* pIn_buf_size,
|
||||
uint8_t * pOut_buf_start, uint8_t * pOut_buf_next, size_t* pOut_buf_size,
|
||||
uint32_t decomp_flags)
|
||||
static tinfl_status tinfl_decompress(tinfl_decompressor* r,
|
||||
const uint8_t * pIn_buf_next, size_t* pIn_buf_size,
|
||||
uint8_t * pOut_buf_start, uint8_t * pOut_buf_next, size_t* pOut_buf_size,
|
||||
uint32_t decomp_flags)
|
||||
{
|
||||
r->next_in = (Bytef*)pIn_buf_next;
|
||||
r->avail_in = *pIn_buf_size;
|
||||
r->next_out = pOut_buf_next;
|
||||
r->next_in = (Bytef*)pIn_buf_next;
|
||||
r->avail_in = *pIn_buf_size;
|
||||
r->next_out = pOut_buf_next;
|
||||
r->avail_out = *pOut_buf_size;
|
||||
return inflate(r, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? Z_NO_FLUSH : Z_SYNC_FLUSH);
|
||||
return inflate(r, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT)
|
||||
? Z_NO_FLUSH : Z_SYNC_FLUSH);
|
||||
}
|
||||
|
||||
static void tinfl_deinit(tinfl_decompressor* r)
|
||||
@ -49,14 +55,18 @@ static void tinfl_deinit(tinfl_decompressor* r)
|
||||
}
|
||||
#endif
|
||||
|
||||
uint32_t read8r(const uint8_t* source) { return *source; }
|
||||
uint32_t read8r(const uint8_t* source)
|
||||
{
|
||||
return *source;
|
||||
}
|
||||
|
||||
uint32_t read24r(const uint8_t* source)
|
||||
{
|
||||
return ((source[0]<<16) | (source[1]<<8) | (source[2]<<0));
|
||||
return ((source[0] << 16) | (source[1] << 8) | (source[2] << 0));
|
||||
}
|
||||
uint32_t read32r(const uint8_t* source)
|
||||
{
|
||||
return ((source[0]<<24) | (source[1]<<16) | (source[2]<<8) | (source[3]<<0));
|
||||
return ((source[0] << 24) | (source[1] << 16) | (source[2] << 8) | (source[3] << 0));
|
||||
}
|
||||
|
||||
#define read8(target) do { target=read8r(chunkdata); chunkdata++; } while(0)
|
||||
@ -65,52 +75,82 @@ uint32_t read32r(const uint8_t* source)
|
||||
|
||||
bool png_decode(const void * pngdata, size_t pnglen, struct mpng_image * img, enum video_format format)
|
||||
{
|
||||
tinfl_decompressor inflator;
|
||||
|
||||
unsigned i;
|
||||
unsigned b, x, y;
|
||||
|
||||
memset(img, 0, sizeof(struct mpng_image));
|
||||
if (format!=FMT_RGB888 && format!=FMT_XRGB8888 && format!=FMT_ARGB8888) return false;
|
||||
|
||||
if (pnglen<8) return false;
|
||||
const uint8_t * data=(const uint8_t*)pngdata;
|
||||
if (memcmp(data, "\x89PNG\r\n\x1A\n", 8)) return false;
|
||||
const uint8_t * dataend=data+pnglen;
|
||||
data+=8;
|
||||
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
uint8_t * pixels=NULL;
|
||||
uint8_t * pixelsat;
|
||||
uint8_t * pixelsend;
|
||||
|
||||
//chop off some warnings... these are all initialized in IHDR
|
||||
unsigned int bitsperchannel;
|
||||
unsigned int colortype;
|
||||
unsigned int compressiontype;
|
||||
unsigned int filtertype;
|
||||
unsigned int interlacetype;
|
||||
unsigned int bpl;
|
||||
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
uint8_t * pixelsat;
|
||||
uint8_t * pixelsend;
|
||||
|
||||
unsigned int palette[256];
|
||||
memset(palette, 0, sizeof(palette));//not gonna catch palette overflows
|
||||
int palettelen=0;
|
||||
int palettelen = 0;
|
||||
|
||||
const uint8_t *data = NULL;
|
||||
const uint8_t *dataend = NULL;
|
||||
uint8_t * pixels = NULL;
|
||||
|
||||
memset(img, 0, sizeof(struct mpng_image));
|
||||
|
||||
if (format!=FMT_RGB888 && format!=FMT_XRGB8888 && format!=FMT_ARGB8888)
|
||||
return false;
|
||||
|
||||
if (pnglen<8)
|
||||
return false;
|
||||
|
||||
data = (const uint8_t*)pngdata;
|
||||
|
||||
if (!data)
|
||||
return false;
|
||||
|
||||
if (memcmp(data, "\x89PNG\r\n\x1A\n", 8))
|
||||
return false;
|
||||
|
||||
dataend = data + pnglen;
|
||||
data += 8;
|
||||
|
||||
/* not gonna catch palette overflows */
|
||||
memset(palette, 0, sizeof(palette));
|
||||
|
||||
tinfl_decompressor inflator;
|
||||
tinfl_init(&inflator);
|
||||
|
||||
while (true)
|
||||
{
|
||||
if (data+4+4>dataend) goto bad;
|
||||
unsigned int chunklen=read32r(data);
|
||||
unsigned int chunktype=read32r(data+4);
|
||||
if (chunklen>=0x80000000) goto bad;
|
||||
if (data+4+chunklen+4>dataend) goto bad;
|
||||
unsigned int chunkchecksum=mz_crc32(mz_crc32(0, NULL, 0), (uint8_t*)data+4, 4+chunklen);
|
||||
const uint8_t * chunkdata=data+4+4;
|
||||
unsigned int actualchunkchecksum=read32r(data+4+4+chunklen);
|
||||
if (actualchunkchecksum!=chunkchecksum) goto bad;
|
||||
unsigned int chunklen;
|
||||
unsigned int chunktype;
|
||||
unsigned int chunkchecksum;
|
||||
unsigned int actualchunkchecksum;
|
||||
const uint8_t * chunkdata = NULL;
|
||||
|
||||
if (data + 4 + 4 > dataend)
|
||||
goto bad;
|
||||
|
||||
chunklen = read32r(data);
|
||||
chunktype = read32r(data + 4);
|
||||
|
||||
if (chunklen >= 0x80000000)
|
||||
goto bad;
|
||||
if (data + 4 + chunklen + 4 > dataend)
|
||||
goto bad;
|
||||
|
||||
chunkchecksum = mz_crc32(mz_crc32(0, NULL, 0), (uint8_t*)data+4, 4+chunklen);
|
||||
chunkdata = data+4+4;
|
||||
actualchunkchecksum = read32r(data+4+4+chunklen);
|
||||
|
||||
if (actualchunkchecksum != chunkchecksum)
|
||||
goto bad;
|
||||
|
||||
data+=4+4+chunklen+4;
|
||||
data += 4 + 4 + chunklen + 4;
|
||||
|
||||
switch (chunktype)
|
||||
{
|
||||
case 0x49484452: //IHDR
|
||||
@ -123,38 +163,64 @@ bool png_decode(const void * pngdata, size_t pnglen, struct mpng_image * img, en
|
||||
read8(filtertype);
|
||||
read8(interlacetype);
|
||||
|
||||
if (width>=0x80000000) goto bad;
|
||||
if (width==0) goto bad;
|
||||
if (height>=0x80000000) goto bad;
|
||||
if (height==0) goto bad;
|
||||
if (colortype!=2 && colortype!=3 && colortype!=6) goto bad;
|
||||
//Greyscale 0
|
||||
//Truecolour 2
|
||||
//Indexed-colour 3
|
||||
//Greyscale with alpha 4
|
||||
//Truecolour with alpha 6
|
||||
if (colortype==2 && bitsperchannel!=8) goto bad;//truecolor; can be 16bpp but I don't want that.
|
||||
if (colortype==3 && bitsperchannel!=1 && bitsperchannel!=2 && bitsperchannel!=4 && bitsperchannel!=8) goto bad;//paletted
|
||||
if (colortype==6 && bitsperchannel!=8) goto bad;//truecolor with alpha
|
||||
if (colortype==6 && format!=FMT_ARGB8888) goto bad;//can only decode alpha on ARGB formats
|
||||
if (compressiontype!=0) goto bad;
|
||||
if (filtertype!=0) goto bad;
|
||||
if (interlacetype!=0 && interlacetype!=1) goto bad;
|
||||
if (width>=0x80000000)
|
||||
goto bad;
|
||||
if (width==0)
|
||||
goto bad;
|
||||
if (height>=0x80000000)
|
||||
goto bad;
|
||||
if (height==0)
|
||||
goto bad;
|
||||
if (colortype!=2 && colortype!=3 && colortype!=6)
|
||||
goto bad;
|
||||
|
||||
//Greyscale 0
|
||||
//Truecolour 2
|
||||
//Indexed-colour 3
|
||||
//Greyscale with alpha 4
|
||||
//Truecolour with alpha 6
|
||||
if (colortype==2 && bitsperchannel!=8)
|
||||
goto bad;//truecolor; can be 16bpp but I don't want that.
|
||||
if (colortype==3 && bitsperchannel!=1 && bitsperchannel!=2 && bitsperchannel!=4 && bitsperchannel!=8)
|
||||
goto bad;//paletted
|
||||
if (colortype==6 && bitsperchannel!=8)
|
||||
goto bad;//truecolor with alpha
|
||||
if (colortype==6 && format!=FMT_ARGB8888)
|
||||
goto bad;//can only decode alpha on ARGB formats
|
||||
if (compressiontype!=0)
|
||||
goto bad;
|
||||
if (filtertype!=0)
|
||||
goto bad;
|
||||
if (interlacetype!=0 && interlacetype!=1)
|
||||
goto bad;
|
||||
|
||||
if (colortype==2) bpl=3*width;
|
||||
if (colortype==3) bpl=(width*bitsperchannel + bitsperchannel-1)/8;
|
||||
if (colortype==6) bpl=4*width;
|
||||
pixels=(uint8_t*)malloc((bpl+1)*height); if (!pixels) goto bad;
|
||||
pixelsat=pixels;
|
||||
pixelsend=pixels+(bpl+1)*height;
|
||||
if (colortype==2)
|
||||
bpl=3*width;
|
||||
if (colortype==3)
|
||||
bpl=(width*bitsperchannel + bitsperchannel-1)/8;
|
||||
if (colortype==6)
|
||||
bpl=4*width;
|
||||
|
||||
pixels = (uint8_t*)malloc((bpl+1)*height); if (!pixels) goto bad;
|
||||
|
||||
if (!pixels)
|
||||
goto bad;
|
||||
|
||||
pixelsat = pixels;
|
||||
pixelsend = pixels+(bpl+1)*height;
|
||||
}
|
||||
break;
|
||||
case 0x504c5445: //PLTE
|
||||
{
|
||||
if (pixels==NULL || palettelen!=0) goto bad;
|
||||
if (chunklen==0 || chunklen%3 || chunklen>3*256) goto bad;
|
||||
if (colortype!=3) break;//palette on rgb is allowed but rare, and it's just a recommendation anyways.
|
||||
palettelen=chunklen/3;
|
||||
if (pixels == NULL || palettelen!=0)
|
||||
goto bad;
|
||||
if (chunklen == 0 || chunklen%3 || chunklen>3*256)
|
||||
goto bad;
|
||||
if (colortype!=3)
|
||||
break;//palette on rgb is allowed but rare, and it's just a recommendation anyways.
|
||||
|
||||
palettelen = chunklen/3;
|
||||
|
||||
for (i=0;i<palettelen;i++)
|
||||
{
|
||||
read24(palette[i]);
|
||||
@ -163,235 +229,283 @@ bool png_decode(const void * pngdata, size_t pnglen, struct mpng_image * img, en
|
||||
}
|
||||
break;
|
||||
case 0x74524E53: //tRNS
|
||||
{
|
||||
if (format!=FMT_ARGB8888 || pixels==NULL || pixels!=pixelsat) goto bad;
|
||||
if (colortype==2)
|
||||
{
|
||||
if (palettelen==0) goto bad;
|
||||
goto bad;
|
||||
}
|
||||
else if (colortype==3)
|
||||
{
|
||||
goto bad;
|
||||
}
|
||||
else goto bad;
|
||||
}
|
||||
{
|
||||
if (format!=FMT_ARGB8888 || pixels == NULL || pixels!=pixelsat)
|
||||
goto bad;
|
||||
if (colortype == 2)
|
||||
{
|
||||
if (palettelen == 0)
|
||||
goto bad;
|
||||
goto bad;
|
||||
}
|
||||
else if (colortype == 3)
|
||||
{
|
||||
goto bad;
|
||||
}
|
||||
else goto bad;
|
||||
}
|
||||
break;
|
||||
case 0x49444154: //IDAT
|
||||
{
|
||||
if (pixels==NULL || (colortype==3 && palettelen==0)) goto bad;
|
||||
size_t chunklencopy=chunklen;
|
||||
size_t byteshere=(pixelsend-pixelsat)+1;
|
||||
tinfl_status status=tinfl_decompress(&inflator, (const uint8_t*)chunkdata, &chunklencopy, pixels, pixelsat, &byteshere,
|
||||
TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER);
|
||||
pixelsat+=byteshere;
|
||||
if (status<0) goto bad;
|
||||
size_t chunklencopy, byteshere;
|
||||
tinfl_status status;
|
||||
|
||||
if (pixels == NULL || (colortype == 3 && palettelen == 0))
|
||||
goto bad;
|
||||
chunklencopy = chunklen;
|
||||
byteshere = (pixelsend-pixelsat)+1;
|
||||
status = tinfl_decompress(&inflator, (const uint8_t*)chunkdata,
|
||||
&chunklencopy, pixels, pixelsat, &byteshere,
|
||||
TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF
|
||||
| TINFL_FLAG_PARSE_ZLIB_HEADER);
|
||||
pixelsat += byteshere;
|
||||
|
||||
if (status<0)
|
||||
goto bad;
|
||||
}
|
||||
break;
|
||||
case 0x49454e44: //IEND
|
||||
{
|
||||
if (data!=dataend) goto bad;
|
||||
if (chunklen) goto bad;
|
||||
size_t zero=0;
|
||||
size_t finalbytes=(pixelsend-pixelsat);
|
||||
tinfl_status status=tinfl_decompress(&inflator, (const uint8_t*)NULL, &zero, pixels, pixelsat, &finalbytes,
|
||||
TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER);
|
||||
pixelsat+=finalbytes;
|
||||
if (status!=TINFL_STATUS_DONE) goto bad;
|
||||
if (pixelsat!=pixelsend) goto bad;//too little data (can't be too much because we didn't give it that buffer size)
|
||||
uint8_t * out=(uint8_t*)malloc(videofmt_byte_per_pixel(format)*width*height);
|
||||
size_t zero, finalbytes;
|
||||
tinfl_status status;
|
||||
unsigned int bpppacked;
|
||||
uint8_t * out = NULL;
|
||||
uint8_t *filteredline = NULL;
|
||||
uint8_t *prevout = NULL;
|
||||
|
||||
if (data!=dataend)
|
||||
goto bad;
|
||||
if (chunklen)
|
||||
goto bad;
|
||||
zero = 0;
|
||||
finalbytes = (pixelsend-pixelsat);
|
||||
status = tinfl_decompress(&inflator,
|
||||
(const uint8_t*)NULL, &zero, pixels, pixelsat, &finalbytes,
|
||||
TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER);
|
||||
|
||||
pixelsat += finalbytes;
|
||||
|
||||
if (status!=TINFL_STATUS_DONE)
|
||||
goto bad;
|
||||
if (pixelsat!=pixelsend)
|
||||
goto bad;//too little data (can't be too much because we didn't give it that buffer size)
|
||||
|
||||
out = (uint8_t*)malloc(videofmt_byte_per_pixel(format)*width*height);
|
||||
|
||||
if (!out)
|
||||
goto bad;
|
||||
|
||||
//TODO: deinterlace at random point
|
||||
|
||||
//run filters
|
||||
unsigned int bpppacked=((colortype==2)?3:(colortype==6)?4:1);
|
||||
uint8_t * prevout=out+(4*width*1);
|
||||
if (height==1)
|
||||
{
|
||||
bpppacked = ((colortype == 2) ? 3 : (colortype == 6) ? 4 : 1);
|
||||
prevout = out + (4 * width * 1);
|
||||
|
||||
if (!prevout)
|
||||
goto bad;
|
||||
|
||||
//this will blow up if a 1px high image is filtered with Paeth, but who the hell would do that?
|
||||
if (height == 1)
|
||||
prevout=out;
|
||||
//this will blow up if a 1px high image is filtered with Paeth, but who the hell would do that?
|
||||
}
|
||||
|
||||
memset(prevout, 0, 4*width*1);//not using bpp here because we only need a chunk of black anyways
|
||||
uint8_t * filteredline=pixels;
|
||||
filteredline = pixels;
|
||||
|
||||
if (!filteredline)
|
||||
goto bad;
|
||||
|
||||
for (y=0;y<height;y++)
|
||||
{
|
||||
uint8_t * thisout=out+(bpl*y);
|
||||
uint8_t *thisout = out + (bpl*y);
|
||||
|
||||
switch (*(filteredline++))
|
||||
{
|
||||
case 0:
|
||||
memcpy(thisout, filteredline, bpl);
|
||||
break;
|
||||
case 1:
|
||||
memcpy(thisout, filteredline, bpppacked);
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
thisout[x]=thisout[x-bpppacked]+filteredline[x];
|
||||
break;
|
||||
case 2:
|
||||
for (x=0;x<bpl;x++)
|
||||
{
|
||||
thisout[x]=prevout[x]+filteredline[x];
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
for (x=0;x<bpppacked;x++)
|
||||
{
|
||||
int a=0;
|
||||
int b=prevout[x];
|
||||
thisout[x]=(a+b)/2+filteredline[x];
|
||||
}
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
{
|
||||
int a=thisout[x-bpppacked];
|
||||
int b=prevout[x];
|
||||
thisout[x]=(a+b)/2+filteredline[x];
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
for (x=0;x<bpppacked;x++)
|
||||
{
|
||||
int prediction;
|
||||
|
||||
int a=0;
|
||||
int b=prevout[x];
|
||||
int c=0;
|
||||
|
||||
int p=a+b-c;
|
||||
int pa=abs(p-a);
|
||||
int pb=abs(p-b);
|
||||
int pc=abs(p-c);
|
||||
|
||||
if (pa<=pb && pa<=pc) prediction=a;
|
||||
else if (pb<=pc) prediction=b;
|
||||
else prediction=c;
|
||||
|
||||
thisout[x]=filteredline[x]+prediction;
|
||||
}
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
{
|
||||
int prediction;
|
||||
|
||||
int a=thisout[x-bpppacked];
|
||||
int b=prevout[x];
|
||||
int c=prevout[x-bpppacked];
|
||||
|
||||
int p=a+b-c;
|
||||
int pa=abs(p-a);
|
||||
int pb=abs(p-b);
|
||||
int pc=abs(p-c);
|
||||
|
||||
if (pa<=pb && pa<=pc) prediction=a;
|
||||
else if (pb<=pc) prediction=b;
|
||||
else prediction=c;
|
||||
|
||||
thisout[x]=filteredline[x]+prediction;
|
||||
}
|
||||
break;
|
||||
default: goto bad;
|
||||
}
|
||||
{
|
||||
case 0:
|
||||
memcpy(thisout, filteredline, bpl);
|
||||
break;
|
||||
case 1:
|
||||
memcpy(thisout, filteredline, bpppacked);
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
thisout[x]=thisout[x-bpppacked]+filteredline[x];
|
||||
break;
|
||||
case 2:
|
||||
for (x=0;x<bpl;x++)
|
||||
{
|
||||
thisout[x]=prevout[x]+filteredline[x];
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
for (x=0;x<bpppacked;x++)
|
||||
{
|
||||
int a=0;
|
||||
int b=prevout[x];
|
||||
thisout[x]=(a+b)/2+filteredline[x];
|
||||
}
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
{
|
||||
int a=thisout[x-bpppacked];
|
||||
int b=prevout[x];
|
||||
thisout[x]=(a+b)/2+filteredline[x];
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
for (x=0;x<bpppacked;x++)
|
||||
{
|
||||
int prediction;
|
||||
|
||||
int a = 0;
|
||||
int b = prevout[x];
|
||||
int c = 0;
|
||||
|
||||
int p = a + b - c;
|
||||
int pa = abs(p - a);
|
||||
int pb = abs(p - b);
|
||||
int pc = abs(p - c);
|
||||
|
||||
if (pa <= pb && pa <= pc)
|
||||
prediction = a;
|
||||
else if (pb <= pc)
|
||||
prediction = b;
|
||||
else
|
||||
prediction = c;
|
||||
|
||||
thisout[x] = filteredline[x] + prediction;
|
||||
}
|
||||
for (x=bpppacked;x<bpl;x++)
|
||||
{
|
||||
int prediction;
|
||||
|
||||
int a = thisout[x-bpppacked];
|
||||
int b = prevout[x];
|
||||
int c = prevout[x-bpppacked];
|
||||
|
||||
int p = a + b - c;
|
||||
int pa = abs(p - a);
|
||||
int pb = abs(p - b);
|
||||
int pc = abs(p - c);
|
||||
|
||||
if (pa <= pb && pa <= pc)
|
||||
prediction = a;
|
||||
else if (pb <= pc)
|
||||
prediction = b;
|
||||
else
|
||||
prediction = c;
|
||||
|
||||
thisout[x] = filteredline[x] + prediction;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
goto bad;
|
||||
}
|
||||
prevout=thisout;
|
||||
filteredline+=bpl;
|
||||
}
|
||||
|
||||
//unpack paletted data
|
||||
//not sure if these aliasing tricks are valid, but the prerequisites for that bugging up are pretty much impossible to hit.
|
||||
if (colortype==3)
|
||||
if (colortype == 3)
|
||||
{
|
||||
switch (bitsperchannel)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
int y=height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
do {
|
||||
uint8_t * inp=out+y*bpl;
|
||||
|
||||
int x=(width+7)/8;
|
||||
do {
|
||||
x--;
|
||||
inp--;
|
||||
for (b=0;b<8;b++)
|
||||
{
|
||||
int rgb32=palette[((*inp)>>b)&1];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
}
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
int y=height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
do {
|
||||
unsigned char * inp=out+y*bpl;
|
||||
|
||||
int x=(width+3)/4;
|
||||
do {
|
||||
x--;
|
||||
inp--;
|
||||
for (b=0;b<8;b+=2)
|
||||
{
|
||||
int rgb32=palette[((*inp)>>b)&3];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
}
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
{
|
||||
int y=height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
do {
|
||||
unsigned char * inp=out+y*bpl;
|
||||
|
||||
int x=(width+1)/2;
|
||||
do {
|
||||
x--;
|
||||
inp--;
|
||||
int rgb32=palette[*inp&15];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
rgb32=palette[*inp>>4];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
{
|
||||
uint8_t * inp=out+width*height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
int i=width*height;
|
||||
do {
|
||||
i--;
|
||||
inp-=1;
|
||||
int rgb32=palette[*inp];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
} while(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
int y = height;
|
||||
uint8_t *outp = out + 3 * width * height;
|
||||
|
||||
do
|
||||
{
|
||||
uint8_t *inp = out + y * bpl;
|
||||
int x = (width+7) / 8;
|
||||
|
||||
do
|
||||
{
|
||||
x--;
|
||||
inp--;
|
||||
for (b = 0; b < 8; b++)
|
||||
{
|
||||
int rgb32=palette[((*inp)>>b)&1];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
}
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
{
|
||||
int y=height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
do
|
||||
{
|
||||
int x;
|
||||
unsigned char *inp = out + y * bpl;
|
||||
|
||||
x =(width + 3) / 4;
|
||||
|
||||
do {
|
||||
x--;
|
||||
inp--;
|
||||
for (b=0;b<8;b+=2)
|
||||
{
|
||||
int rgb32=palette[((*inp)>>b)&3];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
}
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
{
|
||||
int y=height;
|
||||
uint8_t * outp=out+3*width*height;
|
||||
do {
|
||||
unsigned char * inp=out+y*bpl;
|
||||
|
||||
int x=(width+1)/2;
|
||||
do {
|
||||
x--;
|
||||
inp--;
|
||||
int rgb32=palette[*inp&15];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
rgb32=palette[*inp>>4];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
} while(x);
|
||||
y--;
|
||||
} while(y);
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
{
|
||||
uint8_t *inp = out+width*height;
|
||||
uint8_t *outp = out+3*width*height;
|
||||
int i=width*height;
|
||||
do {
|
||||
i--;
|
||||
inp-=1;
|
||||
int rgb32=palette[*inp];
|
||||
*(--outp)=rgb32>>0;
|
||||
*(--outp)=rgb32>>8;
|
||||
*(--outp)=rgb32>>16;
|
||||
} while(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//unpack to 32bpp if requested
|
||||
if (format!=FMT_RGB888 && colortype==2)
|
||||
if (format != FMT_RGB888 && colortype == 2)
|
||||
{
|
||||
uint8_t * inp=out+width*height*3;
|
||||
uint32_t * outp=((uint32_t*)out)+width*height;
|
||||
uint8_t *inp = out+width*height*3;
|
||||
uint32_t *outp = ((uint32_t*)out)+width*height;
|
||||
int i=width*height;
|
||||
do {
|
||||
i--;
|
||||
@ -412,7 +526,8 @@ goto bad;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if (!(chunktype&0x20000000)) goto bad;//unknown critical
|
||||
if (!(chunktype&0x20000000))
|
||||
goto bad;//unknown critical
|
||||
//otherwise ignore
|
||||
}
|
||||
}
|
||||
@ -421,5 +536,6 @@ bad:
|
||||
tinfl_deinit(&inflator);
|
||||
free(pixels);
|
||||
memset(img, 0, sizeof(struct mpng_image));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user