Skip to content

Commit 11bdf10

Browse files
author
bors-servo
authored
Auto merge of #150 - waywardmonkeys:switch-to-f32-from-c_float, r=jdm
bindgen now outputs f32 instead of c_float. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-harfbuzz/150) <!-- Reviewable:end -->
2 parents 8bdf0d0 + 13fc2b4 commit 11bdf10

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

harfbuzz-sys/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ extern "C" {
452452
#[derive(Debug, Copy, Clone)]
453453
pub struct hb_variation_t {
454454
pub tag: hb_tag_t,
455-
pub value: ::std::os::raw::c_float,
455+
pub value: f32,
456456
}
457457
#[test]
458458
fn bindgen_test_layout_hb_variation_t() {
@@ -2053,10 +2053,10 @@ extern "C" {
20532053
);
20542054
}
20552055
extern "C" {
2056-
pub fn hb_font_set_ptem(font: *mut hb_font_t, ptem: ::std::os::raw::c_float);
2056+
pub fn hb_font_set_ptem(font: *mut hb_font_t, ptem: f32);
20572057
}
20582058
extern "C" {
2059-
pub fn hb_font_get_ptem(font: *mut hb_font_t) -> ::std::os::raw::c_float;
2059+
pub fn hb_font_get_ptem(font: *mut hb_font_t) -> f32;
20602060
}
20612061
extern "C" {
20622062
pub fn hb_font_set_variations(
@@ -2068,7 +2068,7 @@ extern "C" {
20682068
extern "C" {
20692069
pub fn hb_font_set_var_coords_design(
20702070
font: *mut hb_font_t,
2071-
coords: *const ::std::os::raw::c_float,
2071+
coords: *const f32,
20722072
coords_length: ::std::os::raw::c_uint,
20732073
);
20742074
}
@@ -3798,9 +3798,9 @@ pub struct hb_ot_var_axis_info_t {
37983798
pub tag: hb_tag_t,
37993799
pub name_id: hb_ot_name_id_t,
38003800
pub flags: hb_ot_var_axis_flags_t,
3801-
pub min_value: ::std::os::raw::c_float,
3802-
pub default_value: ::std::os::raw::c_float,
3803-
pub max_value: ::std::os::raw::c_float,
3801+
pub min_value: f32,
3802+
pub default_value: f32,
3803+
pub max_value: f32,
38043804
pub reserved: ::std::os::raw::c_uint,
38053805
}
38063806
#[test]
@@ -3935,7 +3935,7 @@ extern "C" {
39353935
face: *mut hb_face_t,
39363936
instance_index: ::std::os::raw::c_uint,
39373937
coords_length: *mut ::std::os::raw::c_uint,
3938-
coords: *mut ::std::os::raw::c_float,
3938+
coords: *mut f32,
39393939
) -> ::std::os::raw::c_uint;
39403940
}
39413941
extern "C" {
@@ -3951,7 +3951,7 @@ extern "C" {
39513951
pub fn hb_ot_var_normalize_coords(
39523952
face: *mut hb_face_t,
39533953
coords_length: ::std::os::raw::c_uint,
3954-
design_coords: *const ::std::os::raw::c_float,
3954+
design_coords: *const f32,
39553955
normalized_coords: *mut ::std::os::raw::c_int,
39563956
);
39573957
}

0 commit comments

Comments
 (0)