walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[aat.feat] Port to SortedUnsizedArrayOf.bsearch()

This commit is contained in:
Behdad Esfahbod 2018-11-24 10:54:40 -05:00
parent 52ae9867ef
commit c225606833
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hb-aat-layout-feat-table.hh
View File

@ -69,12 +69,10 @@ struct feat;
struct FeatureName struct FeatureName
{ {
static int cmp (const void *key_, const void *entry_) int cmp (hb_aat_layout_feature_type_t key) const
{ {
hb_aat_layout_feature_selector_t key = * (hb_aat_layout_feature_selector_t *) key_; return key < feature ? -1 :
const FeatureName * entry = (const FeatureName *) entry_; key > feature ? +1 :
return key < entry->feature ? -1 :
key > entry->feature ? +1 :
0; 0;
} }
@ -155,6 +153,8 @@ struct feat
{ {
static const hb_tag_t tableTag = HB_AAT_TAG_feat; static const hb_tag_t tableTag = HB_AAT_TAG_feat;
inline bool has_data (void) const { return version.to_int (); }
inline unsigned int get_feature_types (unsigned int start_offset, inline unsigned int get_feature_types (unsigned int start_offset,
unsigned int *count, unsigned int *count,
hb_aat_layout_feature_type_t *features) const hb_aat_layout_feature_type_t *features) const
@ -172,12 +172,7 @@ struct feat
inline const FeatureName& get_feature (hb_aat_layout_feature_type_t key) const inline const FeatureName& get_feature (hb_aat_layout_feature_type_t key) const
{ {
const FeatureName* feature = (FeatureName*) hb_bsearch (&key, &namesZ, return namesZ.bsearch (featureNameCount, key);
featureNameCount,
FeatureName::static_size,
FeatureName::cmp);
return feature ? *feature : Null (FeatureName);
} }
inline hb_ot_name_id_t get_feature_name_id (hb_aat_layout_feature_type_t feature) const inline hb_ot_name_id_t get_feature_name_id (hb_aat_layout_feature_type_t feature) const
@ -211,7 +206,7 @@ struct feat
/* The number of entries in the feature name array. */ /* The number of entries in the feature name array. */
HBUINT16 reserved1; /* Reserved (set to zero). */ HBUINT16 reserved1; /* Reserved (set to zero). */
HBUINT32 reserved2; /* Reserved (set to zero). */ HBUINT32 reserved2; /* Reserved (set to zero). */
UnsizedArrayOf<FeatureName> SortedUnsizedArrayOf<FeatureName>
namesZ; /* The feature name array. */ namesZ; /* The feature name array. */
public: public:
DEFINE_SIZE_STATIC (24); DEFINE_SIZE_STATIC (24);