OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Add casts to da_push_back_array arguments

Browse source
This commit is contained in:
Norihiro Kamae 2021-07-21 22:34:42 +09:00
parent 10cf411f99
commit d65ca911dd
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libobs/graphics/effect-parser.c
View file

@ -1017,12 +1017,14 @@ static inline int ep_parse_param_assign_intfloat(struct effect_parser *ep,
float f = (float)os_strtod(ep->cfp.cur_token->str.array);
if (is_negative)
f = -f;
da_push_back_array(param->default_val, &f, sizeof(float));
da_push_back_array(param->default_val, (uint8_t *)&f,
sizeof(float));
} else {
long l = strtol(ep->cfp.cur_token->str.array, NULL, 10);
if (is_negative)
l = -l;
da_push_back_array(param->default_val, &l, sizeof(long));
da_push_back_array(param->default_val, (uint8_t *)&l,
sizeof(long));
}
return PARSE_SUCCESS;
@ -1036,11 +1038,13 @@ static inline int ep_parse_param_assign_bool(struct effect_parser *ep,
if (cf_token_is(&ep->cfp, "true")) {
long l = 1;
da_push_back_array(param->default_val, &l, sizeof(long));
da_push_back_array(param->default_val, (uint8_t *)&l,
sizeof(long));
return PARSE_SUCCESS;
} else if (cf_token_is(&ep->cfp, "false")) {
long l = 0;
da_push_back_array(param->default_val, &l, sizeof(long));
da_push_back_array(param->default_val, (uint8_t *)&l,
sizeof(long));
return PARSE_SUCCESS;
}

6
libobs/graphics/shader-parser.c
View file

@ -541,12 +541,14 @@ static inline int sp_parse_param_assign_intfloat(struct shader_parser *sp,
float f = (float)os_strtod(sp->cfp.cur_token->str.array);
if (is_negative)
f = -f;
da_push_back_array(param->default_val, &f, sizeof(float));
da_push_back_array(param->default_val, (uint8_t *)&f,
sizeof(float));
} else {
long l = strtol(sp->cfp.cur_token->str.array, NULL, 10);
if (is_negative)
l = -l;
da_push_back_array(param->default_val, &l, sizeof(long));
da_push_back_array(param->default_val, (uint8_t *)&l,
sizeof(long));
}
return PARSE_SUCCESS;

2
libobs/obs-output.c
View file

@ -1222,7 +1222,7 @@ static bool add_caption(struct obs_output *output, struct encoder_packet *out)
sei_init(&sei, 0.0);
da_init(out_data);
da_push_back_array(out_data, &ref, sizeof(ref));
da_push_back_array(out_data, (uint8_t *)&ref, sizeof(ref));
da_push_back_array(out_data, out->data, out->size);
if (output->caption_data.size > 0) {