Browse Source

libobs: Add casts to da_push_back_array arguments

Norihiro Kamae 4 years ago
parent
commit
d65ca911dd
3 changed files with 13 additions and 7 deletions
  1. 8 4
      libobs/graphics/effect-parser.c
  2. 4 2
      libobs/graphics/shader-parser.c
  3. 1 1
      libobs/obs-output.c

+ 8 - 4
libobs/graphics/effect-parser.c

@@ -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;
 	}
 

+ 4 - 2
libobs/graphics/shader-parser.c

@@ -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;

+ 1 - 1
libobs/obs-output.c

@@ -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) {