Skip to content

Commit

Permalink
Auto merge of #150 - waywardmonkeys:switch-to-f32-from-c_float, r=jdm
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo authored May 28, 2019
2 parents 8bdf0d0 + 13fc2b4 commit 11bdf10
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions harfbuzz-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ extern "C" {
#[derive(Debug, Copy, Clone)]
pub struct hb_variation_t {
pub tag: hb_tag_t,
pub value: ::std::os::raw::c_float,
pub value: f32,
}
#[test]
fn bindgen_test_layout_hb_variation_t() {
Expand Down Expand Up @@ -2053,10 +2053,10 @@ extern "C" {
);
}
extern "C" {
pub fn hb_font_set_ptem(font: *mut hb_font_t, ptem: ::std::os::raw::c_float);
pub fn hb_font_set_ptem(font: *mut hb_font_t, ptem: f32);
}
extern "C" {
pub fn hb_font_get_ptem(font: *mut hb_font_t) -> ::std::os::raw::c_float;
pub fn hb_font_get_ptem(font: *mut hb_font_t) -> f32;
}
extern "C" {
pub fn hb_font_set_variations(
Expand All @@ -2068,7 +2068,7 @@ extern "C" {
extern "C" {
pub fn hb_font_set_var_coords_design(
font: *mut hb_font_t,
coords: *const ::std::os::raw::c_float,
coords: *const f32,
coords_length: ::std::os::raw::c_uint,
);
}
Expand Down Expand Up @@ -3798,9 +3798,9 @@ pub struct hb_ot_var_axis_info_t {
pub tag: hb_tag_t,
pub name_id: hb_ot_name_id_t,
pub flags: hb_ot_var_axis_flags_t,
pub min_value: ::std::os::raw::c_float,
pub default_value: ::std::os::raw::c_float,
pub max_value: ::std::os::raw::c_float,
pub min_value: f32,
pub default_value: f32,
pub max_value: f32,
pub reserved: ::std::os::raw::c_uint,
}
#[test]
Expand Down Expand Up @@ -3935,7 +3935,7 @@ extern "C" {
face: *mut hb_face_t,
instance_index: ::std::os::raw::c_uint,
coords_length: *mut ::std::os::raw::c_uint,
coords: *mut ::std::os::raw::c_float,
coords: *mut f32,
) -> ::std::os::raw::c_uint;
}
extern "C" {
Expand All @@ -3951,7 +3951,7 @@ extern "C" {
pub fn hb_ot_var_normalize_coords(
face: *mut hb_face_t,
coords_length: ::std::os::raw::c_uint,
design_coords: *const ::std::os::raw::c_float,
design_coords: *const f32,
normalized_coords: *mut ::std::os::raw::c_int,
);
}
Expand Down

0 comments on commit 11bdf10

Please sign in to comment.