mirrors/stb
1
0
Fork 0
mirror of https://github.com/nothings/stb synced 2024-12-16 04:42:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-vs2015-warnings' of https://github.com/Reedbeta/stb into working

Browse Source
This commit is contained in:
Sean Barrett 2015-09-13 11:09:23 -07:00
commit 6b8938124e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stb_image.h
View File

@ -5226,7 +5226,7 @@ static stbi_uc *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int
// Read the data. // Read the data.
if (bitdepth == 16) { if (bitdepth == 16) {
for (i = 0; i < pixelCount; i++, p += 4) for (i = 0; i < pixelCount; i++, p += 4)
*p = stbi__get16be(s) >> 8; *p = (stbi_uc) (stbi__get16be(s) >> 8);
} else { } else {
for (i = 0; i < pixelCount; i++, p += 4) for (i = 0; i < pixelCount; i++, p += 4)
*p = stbi__get8(s); *p = stbi__get8(s);
@ -5768,7 +5768,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
if (o == NULL) return NULL; if (o == NULL) return NULL;
if (prev_trans != -1) if (prev_trans != -1)
g->pal[g->transparent][3] = prev_trans; g->pal[g->transparent][3] = (stbi_uc) prev_trans;
return o; return o;
} }
@ -5799,6 +5799,8 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
return stbi__errpuc("unknown code", "Corrupt GIF"); return stbi__errpuc("unknown code", "Corrupt GIF");
} }
} }
STBI_NOTUSED(req_comp);
} }
static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp) static stbi_uc *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp)