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

Fix applying default-value for features 

Previously if a default global feature was overrided by a non-global
user feature, we were not setting any default mask for the feature,
essentially disabling the feature by default.  Fix that.
This commit is contained in:
Behdad Esfahbod 2010-10-13 15:34:50 -04:00
parent 2989be4919
commit 852912fc2d
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -1,8 +1,6 @@
General fixes: General fixes:
============= =============
- Fix feature mask bugs
- Fix tt kern on/off - Fix tt kern on/off
- Remove hb_internal_glyph_info_t, etc - Remove hb_internal_glyph_info_t, etc

10
src/hb-ot-map-private.hh
View File

@ -47,9 +47,10 @@ struct hb_ot_map_t {
struct feature_info_t { struct feature_info_t {
hb_tag_t tag; hb_tag_t tag;
unsigned int value; unsigned int seq; /* sequence#, used for stable sorting only */
unsigned int seq; unsigned int max_value;
bool global; bool global; /* whether the feature applies value to every glyph in the buffer */
unsigned int default_value; /* for non-global features, what should the unset glyphs take */
static int cmp (const feature_info_t *a, const feature_info_t *b) static int cmp (const feature_info_t *a, const feature_info_t *b)
{ return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) : (a->seq < b->seq ? -1 : 1); } { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) : (a->seq < b->seq ? -1 : 1); }
@ -87,9 +88,10 @@ struct hb_ot_map_t {
{ {
feature_info_t *info = &feature_infos[feature_count++]; feature_info_t *info = &feature_infos[feature_count++];
info->tag = tag; info->tag = tag;
info->value = value;
info->seq = feature_count; info->seq = feature_count;
info->max_value = value;
info->global = global; info->global = global;
info->default_value = global ? value : 0;
} }
inline void add_bool_feature (hb_tag_t tag, bool global = true) inline void add_bool_feature (hb_tag_t tag, bool global = true)

13
src/hb-ot-map.cc
View File

@ -98,7 +98,8 @@ hb_ot_map_t::compile (hb_face_t *face,
feature_infos[j] = feature_infos[i]; feature_infos[j] = feature_infos[i];
else { else {
feature_infos[j].global = false; feature_infos[j].global = false;
feature_infos[j].value = MAX (feature_infos[j].value, feature_infos[i].value); feature_infos[j].max_value = MAX (feature_infos[j].max_value, feature_infos[i].max_value);
/* Inherit default_value from j */
} }
} }
feature_count = j + 1; feature_count = j + 1;
@ -112,13 +113,13 @@ hb_ot_map_t::compile (hb_face_t *face,
unsigned int bits_needed; unsigned int bits_needed;
if (info->global && info->value == 1) if (info->global && info->max_value == 1)
/* Uses the global bit */ /* Uses the global bit */
bits_needed = 0; bits_needed = 0;
else else
bits_needed = _hb_bit_storage (info->value); bits_needed = _hb_bit_storage (info->max_value);
if (!info->value || next_bit + bits_needed > 8 * sizeof (hb_mask_t)) if (!info->max_value || next_bit + bits_needed > 8 * sizeof (hb_mask_t))
continue; /* Feature disabled, or not enough bits. */ continue; /* Feature disabled, or not enough bits. */
@ -140,7 +141,7 @@ hb_ot_map_t::compile (hb_face_t *face,
map->tag = info->tag; map->tag = info->tag;
map->index[0] = feature_index[0]; map->index[0] = feature_index[0];
map->index[1] = feature_index[1]; map->index[1] = feature_index[1];
if (info->global && info->value == 1) { if (info->global && info->max_value == 1) {
/* Uses the global bit */ /* Uses the global bit */
map->shift = 0; map->shift = 0;
map->mask = 1; map->mask = 1;
@ -149,7 +150,7 @@ hb_ot_map_t::compile (hb_face_t *face,
map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit); map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit);
next_bit += bits_needed; next_bit += bits_needed;
if (info->global) if (info->global)
global_mask |= map->mask; global_mask |= ((info->default_value << map->shift) & map->mask);
} }
} }