From b791bbbae47aa19709da640a1dc5e84590c5c2c2 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 1 Nov 2018 15:15:56 +0330 Subject: [PATCH] [feat] Apply @jfkthame reviews --- src/hb-aat-layout-feat-table.hh | 27 +++++++++++++++------------ src/hb-aat-layout.cc | 23 ++++++++++++----------- src/hb-aat-layout.h | 14 +++++++++----- test/api/fonts/aat-feat.ttf | Bin 0 -> 1132 bytes test/api/test-aat-layout.c | 30 ++++++++++++++++++------------ 5 files changed, 54 insertions(+), 40 deletions(-) create mode 100644 test/api/fonts/aat-feat.ttf diff --git a/src/hb-aat-layout-feat-table.hh b/src/hb-aat-layout-feat-table.hh index 5e7781353..f151d7146 100644 --- a/src/hb-aat-layout-feat-table.hh +++ b/src/hb-aat-layout-feat-table.hh @@ -84,14 +84,13 @@ struct FeatureName <<<<<<< HEAD ======= inline unsigned int get_settings (const feat *feat, - hb_bool_t *is_exclusive, + hb_aat_feature_setting_t *default_setting, unsigned int start_offset, unsigned int *records_count, hb_aat_feature_option_record_t *records_buffer) const { bool exclusive = featureFlags & Exclusive; bool not_default = featureFlags & NotDefault; - if (is_exclusive) *is_exclusive = exclusive; const UnsizedArrayOf& settings = feat+settingTable; unsigned int len = 0; unsigned int settings_count = nSettings; @@ -100,15 +99,19 @@ struct FeatureName len = MIN (settings_count - start_offset, *records_count); for (unsigned int i = 0; i < len; i++) { - records_buffer[i].is_default = exclusive && not_default && - i + start_offset == (featureFlags & IndexMask); records_buffer[i].name_id = settings[start_offset + i].nameIndex; records_buffer[i].setting = settings[start_offset + i].setting; } - if (exclusive && !not_default && start_offset == 0 && len != 0) - records_buffer[0].is_default = true; } - if (is_exclusive) *is_exclusive = exclusive; + if (default_setting) + { + if (exclusive) + { + if (settings_count && !not_default) *default_setting = settings[0].setting; + else if (not_default) *default_setting = featureFlags & IndexMask; + } + else *default_setting = HB_AAT_FEATURE_NO_DEFAULT_INDEX; + } if (records_count) *records_count = len; return settings_count; } @@ -151,14 +154,14 @@ struct feat return feature ? *feature : Null (FeatureName); } - inline unsigned int get_settings (hb_aat_feature_type_t key, - hb_bool_t *is_exclusive, + inline unsigned int get_settings (hb_aat_feature_type_t type, + hb_aat_feature_setting_t *default_setting, /* OUT. May be NULL. */ unsigned int start_offset, - unsigned int *records_count, + unsigned int *records_count, /* IN/OUT. May be NULL. */ hb_aat_feature_option_record_t *records_buffer) const { - return get_feature (key).get_settings (this, is_exclusive, start_offset, - records_count, records_buffer); + return get_feature (type).get_settings (this, default_setting, + start_offset, records_count, records_buffer); } inline bool sanitize (hb_sanitize_context_t *c) const diff --git a/src/hb-aat-layout.cc b/src/hb-aat-layout.cc index 5eca51756..d9c336b7d 100644 --- a/src/hb-aat-layout.cc +++ b/src/hb-aat-layout.cc @@ -308,12 +308,13 @@ _hb_aat_language_get (hb_face_t *face, /** * hb_aat_get_feature_settings: - * @face: a font face. - * @identifier: aat feature id you are querying. - * @is_exclusive: (out): is only one of the features can be enabled. - * @start_offset: start offset, if you are iterating - * @records_count: (inout): gets input buffer size, puts number of filled one - * @records_buffer: (out): buffer of records + * @face: a font face. + * @identifier: aat feature id you are querying. + * @default_setting: (out): default value for the type. If it is HB_AAT_FEATURE_NO_DEFAULT_INDEX + * means non is default and it is not exclusive also. + * @start_offset: start offset, if you are iterating + * @records_count: (inout): gets input buffer size, puts number of filled one + * @records_buffer: (out): buffer of records * * Returns: Total number of records available for the feature. * @@ -322,11 +323,11 @@ _hb_aat_language_get (hb_face_t *face, unsigned int hb_aat_get_feature_settings (hb_face_t *face, hb_aat_feature_type_t identifier, - hb_bool_t *is_exclusive, + hb_aat_feature_setting_t *default_setting, /* OUT. May be NULL. */ unsigned int start_offset, - unsigned int *records_count, /* IN/OUT. May be NULL. */ - hb_aat_feature_option_record_t *records_buffer /* OUT. May be NULL. */) + unsigned int *records_count, /* IN/OUT. May be NULL. */ + hb_aat_feature_option_record_t *records_buffer /* OUT. May be NULL. */) { - return _get_feat (face).get_settings (identifier, is_exclusive, start_offset, - records_count, records_buffer); + return _get_feat (face).get_settings (identifier, default_setting, + start_offset, records_count, records_buffer); } diff --git a/src/hb-aat-layout.h b/src/hb-aat-layout.h index 186293529..1ca9af728 100644 --- a/src/hb-aat-layout.h +++ b/src/hb-aat-layout.h @@ -57,18 +57,22 @@ typedef uint16_t hb_aat_feature_setting_t; **/ typedef struct hb_aat_feature_option_record_t { - hb_bool_t is_default; hb_aat_feature_setting_t setting; hb_ot_name_id_t name_id; } hb_aat_feature_option_record_t; +/* + * Since: REPLACEME + */ +#define HB_AAT_FEATURE_NO_DEFAULT_INDEX ((hb_aat_feature_setting_t) -1) + HB_EXTERN unsigned int hb_aat_get_feature_settings (hb_face_t *face, - hb_aat_feature_type_t identifier, - hb_bool_t *is_exclusive, + hb_aat_feature_type_t type, + hb_aat_feature_setting_t *default_setting, /* OUT. May be NULL. */ unsigned int start_offset, - unsigned int *records_count, /* IN/OUT. May be NULL. */ - hb_aat_feature_option_record_t *records_buffer /* OUT. May be NULL. */); + unsigned int *records_count, /* IN/OUT. May be NULL. */ + hb_aat_feature_option_record_t *records_buffer /* OUT. May be NULL. */); HB_END_DECLS diff --git a/test/api/fonts/aat-feat.ttf b/test/api/fonts/aat-feat.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1ff99a2dddde9bd0b3a1dfd8110ee7c3bee7a727 GIT binary patch literal 1132 zcmcIjJx>%-6g_WdSeA8GR+JAR(eYyyBSr;L3kp^j*-gkwfPzj27+B(d37fcB7(#4} zh1igoSdiGzsQdt9w6IXAj0G{2SZp-LLK6!TJon84R(8J0d-t4s&wKaYH#1NGY|Oz# z_w~WE?TvNO2Y^b@J2IAa3$V)<$XCeQCOo$|_p1FFU}VTQCo{7Xm*RnL#y7|t(w;kR ze}5k(Ugf-)rXvtDk1}qNA5UkCCDS2-TILeS(R^Ka)-4r`TC_0UO77&`tYabZ%wS} zXnzofFb?kVl{>4P^!HGrpDG-;1zI%)w`^gK4C`-i?&U(umzv|@Krx||Ak zIPkix%4#S3uF^-&c72*E-ht$|VSy2@mhiIL+Va=N?fOJ6_p58JbWP=XX7Y0}a!5|I zYIwpqDt&Bd+>a@g;30z;vKWPnF{Dvs&a1T3$kXd;>@jjv@8HDg<=3%fvMZYX1r~HbU$Ycu9X9&ybE*i5n5tckzjuX6)6N?^typqBZN(97dhq zyFna9z4rekJ`IE4rKL=S6nj^lP^ucH3KEBid2_0knh1hwUnRbuyq=l{%?;H=+rqf~ zBc1dgp*_L9C#h>CKc)Rjond9ty-ZuRAwe6d%-^&q