From 3ed70e5e64910e1c22225f542a525807b000cb2a Mon Sep 17 00:00:00 2001 From: Rod Sheeter Date: Wed, 14 Feb 2018 15:24:49 -0800 Subject: [PATCH] [subset] return bool not hb_bool_t from table::subset --- src/hb-ot-cmap-table.hh | 2 +- src/hb-ot-maxp-table.hh | 2 +- src/hb-ot-os2-table.hh | 2 +- src/hb-subset.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index b7332293f..98f0b5614 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -590,7 +590,7 @@ struct cmap return true; } - inline hb_bool_t subset (hb_subset_plan_t *plan) const + inline bool subset (hb_subset_plan_t *plan) const { hb_auto_array_t groups; diff --git a/src/hb-ot-maxp-table.hh b/src/hb-ot-maxp-table.hh index 00a95d716..34eb9ae84 100644 --- a/src/hb-ot-maxp-table.hh +++ b/src/hb-ot-maxp-table.hh @@ -61,7 +61,7 @@ struct maxp (version.major == 0 && version.minor == 0x5000u))); } - inline hb_bool_t subset (hb_subset_plan_t *plan) const + inline bool subset (hb_subset_plan_t *plan) const { hb_blob_t *maxp_blob = OT::Sanitizer().sanitize (hb_face_reference_table (plan->source, HB_OT_TAG_maxp)); hb_blob_t *maxp_prime_blob = hb_blob_create_sub_blob (maxp_blob, 0, -1); diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh index 1bb9a1535..9bc75c0c0 100644 --- a/src/hb-ot-os2-table.hh +++ b/src/hb-ot-os2-table.hh @@ -49,7 +49,7 @@ struct os2 return_trace (c->check_struct (this)); } - inline hb_bool_t subset (hb_subset_plan_t *plan) const + inline bool subset (hb_subset_plan_t *plan) const { hb_blob_t *os2_blob = OT::Sanitizer().sanitize (hb_face_reference_table (plan->source, HB_OT_TAG_os2)); hb_blob_t *os2_prime_blob = hb_blob_create_sub_blob (os2_blob, 0, -1); diff --git a/src/hb-subset.cc b/src/hb-subset.cc index ce7881f0e..69e8f77d3 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -80,7 +80,7 @@ hb_subset_profile_destroy (hb_subset_profile_t *profile) } template -static hb_bool_t +static bool _subset (hb_subset_plan_t *plan) { OT::Sanitizer sanitizer;