mirror of https://github.com/nothings/stb.git
Avoid GCC sign-compare warning.
GCC 4.7 gave the warning "signed and unsigned type in conditional expression" because the ternary operator mixes signed and unsigned integers. Fixed by casting to unsigned inside the "if" branch instead of casting the result of the entire conditional.
This commit is contained in:
parent
bdef693b7c
commit
a60912f145
|
@ -4642,7 +4642,7 @@ static stbi_uc *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int
|
|||
}
|
||||
} else {
|
||||
for (i=0; i < (int) s->img_x; ++i) {
|
||||
stbi__uint32 v = (stbi__uint32) (bpp == 16 ? stbi__get16le(s) : stbi__get32le(s));
|
||||
stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
|
||||
int a;
|
||||
out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
|
||||
out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
|
||||
|
|
Loading…
Reference in New Issue