yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Michaelangel007/stb into working

Browse Source
This commit is contained in:
Sean Barrett 2015-09-13 05:13:57 -07:00
commit ddd05479e9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stb_image.h
View File

@ -996,6 +996,7 @@ static unsigned char *stbi__load_flip(stbi__context *s, int *x, int *y, int *com
return result; return result;
} }
#ifndef STBI_NO_HDR
static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp) static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
{ {
if (stbi__vertically_flip_on_load && result != NULL) { if (stbi__vertically_flip_on_load && result != NULL) {
@ -1016,7 +1017,7 @@ static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, in
} }
} }
} }
#endif
#ifndef STBI_NO_STDIO #ifndef STBI_NO_STDIO
@ -1160,6 +1161,7 @@ STBIDEF int stbi_is_hdr_from_file(FILE *f)
stbi__start_file(&s,f); stbi__start_file(&s,f);
return stbi__hdr_test(&s); return stbi__hdr_test(&s);
#else #else
STBI_NOTUSED(f);
return 0; return 0;
#endif #endif
} }
@ -1172,6 +1174,8 @@ STBIDEF int stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void
stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user); stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
return stbi__hdr_test(&s); return stbi__hdr_test(&s);
#else #else
STBI_NOTUSED(clbk);
STBI_NOTUSED(user);
return 0; return 0;
#endif #endif
} }
@ -1292,17 +1296,22 @@ static stbi__uint32 stbi__get32be(stbi__context *s)
return (z << 16) + stbi__get16be(s); return (z << 16) + stbi__get16be(s);
} }
#if defined (STBI_NO_BMP) && (STBI_NO_TGA) && (STBI_NO_GIF)
#else
static int stbi__get16le(stbi__context *s) static int stbi__get16le(stbi__context *s)
{ {
int z = stbi__get8(s); int z = stbi__get8(s);
return z + (stbi__get8(s) << 8); return z + (stbi__get8(s) << 8);
} }
#endif
#ifndef STBI_NO_BMP
static stbi__uint32 stbi__get32le(stbi__context *s) static stbi__uint32 stbi__get32le(stbi__context *s)
{ {
stbi__uint32 z = stbi__get16le(s); stbi__uint32 z = stbi__get16le(s);
return z + (stbi__get16le(s) << 16); return z + (stbi__get16le(s) << 16);
} }
#endif
#define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings #define STBI__BYTECAST(x) ((stbi_uc) ((x) & 255)) // truncate int to byte without warnings