80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

fix clang warnings

Browse source
This commit is contained in:
Andrei Alexeyev 2020-04-05 07:41:34 +03:00
parent 0cbc86c66e
commit 54030d17ba
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/progress.c
View file

@ -469,7 +469,7 @@ static void progress_prepare_cmd_stage_playinfo(size_t *bufsize, void **arg) {
e->num_played = p->num_played; data->size += sizeof(uint32_t);
e->num_cleared = p->num_cleared; data->size += sizeof(uint32_t);
list_push(&data->elems, e);
(void)list_push(&data->elems, e);
}
}
});

9
src/util/pixmap_conversion.inc.h
View file

@ -1,6 +1,6 @@
#define _CONV_IN_IS_FLOAT (_CONV_IN_MAX == 1.0f)
#define _CONV_OUT_IS_FLOAT (_CONV_OUT_MAX == 1.0f)
#define _CONV_IN_IS_FLOAT ((float)_CONV_IN_MAX == 1.0f)
#define _CONV_OUT_IS_FLOAT ((float)_CONV_OUT_MAX == 1.0f)
static void _CONV_FUNCNAME(
size_t in_elements,
@ -26,11 +26,12 @@ static void _CONV_FUNCNAME(
fill = (_CONV_OUT_TYPE)round(clamp(*buf_in++, 0, 1) * _CONV_OUT_MAX);
}
} else if(_CONV_OUT_IS_FLOAT) {
fill = *buf_in++ * (1.0f / _CONV_IN_MAX);
fill = *buf_in++ * (1.0f / (float)_CONV_IN_MAX);
} else if(_CONV_OUT_MAX >= _CONV_IN_MAX) {
fill = *buf_in++ * (_CONV_OUT_MAX / _CONV_IN_MAX);
} else {
fill = (_CONV_OUT_TYPE)round(*buf_in++ * ((float)_CONV_OUT_MAX / _CONV_IN_MAX));
// TODO use fixed point math
fill = (_CONV_OUT_TYPE)round(*buf_in++ * ((float)_CONV_OUT_MAX / (float)_CONV_IN_MAX));
}
} else {
fill = default_pixel[element];