mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MPNG) Build fixes

Browse Source
This commit is contained in:
twinaphex 2015-02-17 03:45:32 +01:00
parent f161192ed4
commit 5db053b506
1 changed files with 73 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <boolean.h>
#ifdef WANT_MINIZ #ifdef WANT_MINIZ
#define MINIZ_HEADER_FILE_ONLY #define MINIZ_HEADER_FILE_ONLY
@ -31,10 +32,10 @@ enum mpng_chunk_type
MPNG_CHUNK_IDAT = 0x49444154, MPNG_CHUNK_IDAT = 0x49444154,
MPNG_CHUNK_PLTE = 0x504c5445, MPNG_CHUNK_PLTE = 0x504c5445,
MPNG_CHUNK_IEND = 0x49454e44, MPNG_CHUNK_IEND = 0x49454e44,
} };
bool png_decode(const void *userdata, size_t len, bool png_decode(const void *userdata, size_t len,
struct image *img, videoformat format) struct mpng_image *img, enum video_format format)
{ {
/* chop off some warnings... these are all initialized in IHDR */ /* chop off some warnings... these are all initialized in IHDR */
unsigned int depth; unsigned int depth;
@ -56,12 +57,12 @@ bool png_decode(const void *userdata, size_t len,
if (!data) if (!data)
return false; return false;
memset(img, 0, sizeof(struct image)); memset(img, 0, sizeof(struct mpng_image));
/* Only works for RGB888, XRGB8888, and ARGB8888 */ /* Only works for RGB888, XRGB8888, and ARGB8888 */
if (format != fmt_rgb888 if (format != FMT_RGB888
&& format != fmt_xrgb8888 && format != FMT_XRGB8888
&& format != fmt_argb8888) && format != FMT_ARGB8888)
return false; return false;
if (len < 8) if (len < 8)
@ -147,7 +148,7 @@ bool png_decode(const void *userdata, size_t len,
if (color_type == 6 && depth != 8) if (color_type == 6 && depth != 8)
goto error; /* truecolor with alpha */ goto error; /* truecolor with alpha */
if (color_type == 6 && format != fmt_argb8888) if (color_type == 6 && format != FMT_ARGB8888)
goto error; /* can only decode alpha on ARGB formats */ goto error; /* can only decode alpha on ARGB formats */
if (compression != 0) if (compression != 0)
@ -199,7 +200,7 @@ bool png_decode(const void *userdata, size_t len,
break; break;
case MPNG_CHUNK_TRNS: case MPNG_CHUNK_TRNS:
{ {
if (format != fmt_argb8888 || !pixels || pixels != pixelsat) if (format != FMT_ARGB8888 || !pixels || pixels != pixelsat)
goto error; goto error;
if (color_type == 2) if (color_type == 2)
@ -218,6 +219,9 @@ bool png_decode(const void *userdata, size_t len,
{ {
size_t byteshere; size_t byteshere;
size_t chunklen_copy; size_t chunklen_copy;
#ifdef WANT_MINIZ
tinfl_status status;
#endif
if (!pixels || (color_type == 3 && palette_len == 0)) if (!pixels || (color_type == 3 && palette_len == 0))
goto error; goto error;
@ -226,7 +230,7 @@ bool png_decode(const void *userdata, size_t len,
byteshere = (pixelsend - pixelsat)+1; byteshere = (pixelsend - pixelsat)+1;
#ifdef WANT_MINIZ #ifdef WANT_MINIZ
tinfl_status status = tinfl_decompress(&inflator, status = tinfl_decompress(&inflator,
(const mz_uint8 *)chunkdata, (const mz_uint8 *)chunkdata,
&chunklen_copy, pixels, &chunklen_copy, pixels,
pixelsat, pixelsat,
@ -238,12 +242,15 @@ bool png_decode(const void *userdata, size_t len,
pixelsat += byteshere; pixelsat += byteshere;
#ifdef WANT_MINIZ
if (status < TINFL_STATUS_DONE) if (status < TINFL_STATUS_DONE)
goto error; goto error;
#endif
} }
break; break;
case MPNG_CHUNK_IEND: case MPNG_CHUNK_IEND:
{ {
unsigned b, x, y;
#ifdef WANT_MINIZ #ifdef WANT_MINIZ
tinfl_status status; tinfl_status status;
#endif #endif
@ -266,11 +273,13 @@ bool png_decode(const void *userdata, size_t len,
pixelsat += finalbytes; pixelsat += finalbytes;
#ifdef WANT_MINIZ
if (status < TINFL_STATUS_DONE) if (status < TINFL_STATUS_DONE)
goto error; goto error;
if (status > TINFL_STATUS_DONE) if (status > TINFL_STATUS_DONE)
goto error; goto error;
#endif
if (pixelsat != pixelsend) if (pixelsat != pixelsend)
goto error; /* too little data (can't be too much because we didn't give it that buffer size) */ goto error; /* too little data (can't be too much because we didn't give it that buffer size) */
@ -282,6 +291,7 @@ bool png_decode(const void *userdata, size_t len,
//run filters //run filters
unsigned int bpppacked = ((color_type == 2) ? 3 : (color_type == 6) ? 4 : 1); unsigned int bpppacked = ((color_type == 2) ? 3 : (color_type == 6) ? 4 : 1);
uint8_t * prevout = out + (4 * width * 1); uint8_t * prevout = out + (4 * width * 1);
if (height==1) if (height==1)
{ {
/* This will blow up if a 1px high image is filtered with Paeth, but highly unlikely. */ /* This will blow up if a 1px high image is filtered with Paeth, but highly unlikely. */
@ -293,7 +303,7 @@ bool png_decode(const void *userdata, size_t len,
filteredline = pixels; filteredline = pixels;
for (unsigned int y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
uint8_t * thisout=out+(bpl*y); uint8_t * thisout=out+(bpl*y);
@ -305,21 +315,21 @@ bool png_decode(const void *userdata, size_t len,
case 1: case 1:
memcpy(thisout, filteredline, bpppacked); memcpy(thisout, filteredline, bpppacked);
for (unsigned int x=bpppacked;x<bpl;x++) for (x = bpppacked; x < bpl; x++)
thisout[x]=thisout[x-bpppacked]+filteredline[x]; thisout[x] = thisout[x-bpppacked] + filteredline[x];
break; break;
case 2: case 2:
for (unsigned int x=0;x<bpl;x++) for (x = 0; x < bpl; x++)
thisout[x]=prevout[x]+filteredline[x]; thisout[x] = prevout[x] + filteredline[x];
break; break;
case 3: case 3:
for (unsigned int x=0;x<bpppacked;x++) for (x = 0; x < bpppacked; x++)
{ {
int a=0; int a = 0;
int b=prevout[x]; int b = prevout[x];
thisout[x]=(a+b)/2+filteredline[x]; thisout[x] = (a+b)/2 + filteredline[x];
} }
for (unsigned int x=bpppacked;x<bpl;x++) for (x = bpppacked; x < bpl; x++)
{ {
int a = thisout[x - bpppacked]; int a = thisout[x - bpppacked];
int b = prevout[x]; int b = prevout[x];
@ -327,43 +337,50 @@ bool png_decode(const void *userdata, size_t len,
} }
break; break;
case 4: case 4:
for (unsigned int x=0;x<bpppacked;x++) for (x = 0; x < bpppacked; x++)
{ {
int prediction; int prediction;
int a=0; int a = 0;
int b=prevout[x]; int b = prevout[x];
int c=0; int c = 0;
int p=a+b-c; int p = a+b-c;
int pa=abs(p-a); int pa = abs(p-a);
int pb=abs(p-b); int pb = abs(p-b);
int pc=abs(p-c); int pc = abs(p-c);
if (pa<=pb && pa<=pc) prediction=a; if (pa <= pb && pa <= pc)
else if (pb<=pc) prediction=b; prediction=a;
else prediction=c; else if (pb <= pc)
prediction=b;
else
prediction=c;
thisout[x]=filteredline[x]+prediction; thisout[x] = filteredline[x]+prediction;
} }
for (unsigned int x=bpppacked;x<bpl;x++)
for (x = bpppacked; x < bpl; x++)
{ {
int prediction; int prediction;
int a=thisout[x-bpppacked]; int a = thisout[x-bpppacked];
int b=prevout[x]; int b = prevout[x];
int c=prevout[x-bpppacked]; int c = prevout[x-bpppacked];
int p=a+b-c; int p = a+b-c;
int pa=abs(p-a); int pa = abs(p-a);
int pb=abs(p-b); int pb = abs(p-b);
int pc=abs(p-c); int pc = abs(p-c);
if (pa<=pb && pa<=pc) prediction=a; if (pa <= pb && pa <= pc)
else if (pb<=pc) prediction=b; prediction = a;
else prediction=c; else if (pb <= pc)
prediction = b;
else
prediction = c;
thisout[x]=filteredline[x]+prediction; thisout[x] = filteredline[x] + prediction;
} }
break; break;
default: default:
@ -395,12 +412,12 @@ bool png_decode(const void *userdata, size_t len,
{ {
x--; x--;
inp--; inp--;
for (int b=0;b<8;b++) for (b = 0; b < 8; b++)
{ {
int rgb32=palette[((*inp)>>b)&1]; int rgb32 = palette[((*inp)>>b)&1];
*(--outp)=rgb32>>0; *(--outp) = rgb32 >> 0;
*(--outp)=rgb32>>8; *(--outp) = rgb32 >> 8;
*(--outp)=rgb32>>16; *(--outp) = rgb32 >> 16;
} }
} while(x); } while(x);
y--; y--;
@ -422,10 +439,10 @@ bool png_decode(const void *userdata, size_t len,
inp--; inp--;
for (b = 0;b < 8; b += 2) for (b = 0;b < 8; b += 2)
{ {
int rgb32=palette[((*inp)>>b)&3]; int rgb32 = palette[((*inp)>>b)&3];
*(--outp)=rgb32>>0; *(--outp) = rgb32 >> 0;
*(--outp)=rgb32>>8; *(--outp) = rgb32 >> 8;
*(--outp)=rgb32>>16; *(--outp) = rgb32 >> 16;
} }
} while(x); } while(x);
y--; y--;
@ -470,7 +487,7 @@ bool png_decode(const void *userdata, size_t len,
{ {
int rgb32; int rgb32;
i--; i--;
inp-=1; inp -= 1;
rgb32 = palette[*inp]; rgb32 = palette[*inp];
*(--outp) = rgb32 >> 0; *(--outp) = rgb32 >> 0;
@ -483,7 +500,7 @@ bool png_decode(const void *userdata, size_t len,
} }
/* unpack to 32bpp if requested */ /* unpack to 32bpp if requested */
if (format != fmt_rgb888 && color_type == 2) if (format != FMT_RGB888 && color_type == 2)
{ {
uint8_t *inp = out + width * height * 3; uint8_t *inp = out + width * height * 3;
uint32_t *outp = ((uint32_t*)out) + width * height; uint32_t *outp = ((uint32_t*)out) + width * height;
@ -516,6 +533,6 @@ bool png_decode(const void *userdata, size_t len,
error: error:
free(pixels); free(pixels);
memset(img, 0, sizeof(struct image)); memset(img, 0, sizeof(struct mpng_image));
return false; return false;
} }