Merge branch 'master' into wii-usb

This commit is contained in:
Matthew Parlane
2012-12-24 12:58:15 +13:00
218 changed files with 2286 additions and 1354 deletions

View File

@ -2394,6 +2394,7 @@ static int parse_png_file(png *z, int scan, int req_comp)
// if critical, fail
if ((c.type & (1 << 29)) == 0) {
#ifndef STBI_NO_FAILURE_STRINGS
#ifndef STBI_FAILURE_USERMSG
// not threadsafe
static char invalid_chunk[] = "XXXX chunk not known";
invalid_chunk[0] = (uint8) (c.type >> 24);
@ -2401,6 +2402,7 @@ static int parse_png_file(png *z, int scan, int req_comp)
invalid_chunk[2] = (uint8) (c.type >> 8);
invalid_chunk[3] = (uint8) (c.type >> 0);
#endif
#endif
return e(invalid_chunk, "PNG not supported: unknown chunk type");
}
skip(s, c.length);
@ -2584,7 +2586,7 @@ static int shiftsigned(int v, int shift, int bits)
static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
{
uint8 *out;
unsigned int mr=0,mg=0,mb=0,ma=0, fake_a=0;
unsigned int mr=0,mg=0,mb=0,ma=0;
stbi_uc pal[256][4];
int psize=0,i,j,compress=0,width;
int bpp, flip_vertically, pad, target, offset, hsz;
@ -2634,7 +2636,6 @@ static stbi_uc *bmp_load(stbi *s, int *x, int *y, int *comp, int req_comp)
mg = 0xff << 8;
mb = 0xff << 0;
ma = 0xff << 24;
fake_a = 1; // @TODO: check for cases like alpha value is all 0 and switch it to 255
} else {
mr = 31 << 10;
mg = 31 << 5;

View File

@ -996,25 +996,25 @@
#define HAVE_USLEEP 1
/* Define if you have wcscasecmp() function */
#define HAVE_WCSCASECMP 1
/* #undef HAVE_WCSCASECMP 1 */
/* Define if you have wcsncasecmp() function */
#define HAVE_WCSNCASECMP 1
/* #undef HAVE_WCSNCASECMP 1 */
/* Define if you have wcslen function */
#define HAVE_WCSLEN 1
/* Define if you have wcsdup function */
#define HAVE_WCSDUP 1
/* #undef HAVE_WCSDUP 1 */
/* Define if you have wcsftime() function */
#define HAVE_WCSFTIME 1
/* Define if you have strnlen() function */
#define HAVE_STRNLEN 1
/* #undef HAVE_STRNLEN 1 */
/* Define if you have wcsnlen() function */
#define HAVE_WCSNLEN 1
/* #undef HAVE_WCSNLEN 1 */
/* Define if you have wcstoull() and wcstoll() */
/* #undef HAVE_WCSTOULL */