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

[hb-ms-features] Rename types to be less general

This commit is contained in:
Khaled Hosny 2021-07-27 20:43:53 +02:00
parent 69199211b7
commit 990c15dbe5
3 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-directwrite.cc
View File

@ -614,7 +614,7 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan,
if (num_features) if (num_features)
{ {
hb_vector_t<hb_ms_feature_t> feature_records; hb_vector_t<hb_ms_feature_t> feature_records;
hb_vector_t<range_record_t> range_records; hb_vector_t<hb_ms_range_record_t> range_records;
if (hb_ms_setup_features (features, num_features, feature_records, range_records)) if (hb_ms_setup_features (features, num_features, feature_records, range_records))
hb_ms_make_feature_ranges (feature_records, hb_ms_make_feature_ranges (feature_records,
range_records, range_records,

79
src/hb-ms-feature-ranges.hh
View File

@ -31,7 +31,7 @@
#include "hb.hh" #include "hb.hh"
typedef struct hb_ms_feature_t { typedef struct hb_ms_feature_t {
hb_tag_t tag; uint32_t tag_le;
uint32_t value; uint32_t value;
} hb_ms_feature_t; } hb_ms_feature_t;
@ -40,60 +40,60 @@ typedef struct hb_ms_features_t {
uint32_t num_features; uint32_t num_features;
} hb_ms_features_t; } hb_ms_features_t;
struct active_feature_t { struct hb_ms_active_feature_t {
hb_ms_feature_t fea; hb_ms_feature_t fea;
unsigned int order; unsigned int order;
HB_INTERNAL static int cmp (const void *pa, const void *pb) { HB_INTERNAL static int cmp (const void *pa, const void *pb) {
const active_feature_t *a = (const active_feature_t *) pa; const auto *a = (const hb_ms_active_feature_t *) pa;
const active_feature_t *b = (const active_feature_t *) pb; const auto *b = (const hb_ms_active_feature_t *) pb;
return a->fea.tag < b->fea.tag ? -1 : a->fea.tag > b->fea.tag ? 1 : return a->fea.tag_le < b->fea.tag_le ? -1 : a->fea.tag_le > b->fea.tag_le ? 1 :
a->order < b->order ? -1 : a->order > b->order ? 1 : a->order < b->order ? -1 : a->order > b->order ? 1 :
a->fea.value < b->fea.value ? -1 : a->fea.value > b->fea.value ? 1 : a->fea.value < b->fea.value ? -1 : a->fea.value > b->fea.value ? 1 :
0; 0;
} }
bool operator== (const active_feature_t *f) bool operator== (const hb_ms_active_feature_t *f)
{ return cmp (this, f) == 0; } { return cmp (this, f) == 0; }
}; };
struct feature_event_t { struct hb_ms_feature_event_t {
unsigned int index; unsigned int index;
bool start; bool start;
active_feature_t feature; hb_ms_active_feature_t feature;
HB_INTERNAL static int cmp (const void *pa, const void *pb) HB_INTERNAL static int cmp (const void *pa, const void *pb)
{ {
const feature_event_t *a = (const feature_event_t *) pa; const auto *a = (const hb_ms_feature_event_t *) pa;
const feature_event_t *b = (const feature_event_t *) pb; const auto *b = (const hb_ms_feature_event_t *) pb;
return a->index < b->index ? -1 : a->index > b->index ? 1 : return a->index < b->index ? -1 : a->index > b->index ? 1 :
a->start < b->start ? -1 : a->start > b->start ? 1 : a->start < b->start ? -1 : a->start > b->start ? 1 :
active_feature_t::cmp (&a->feature, &b->feature); hb_ms_active_feature_t::cmp (&a->feature, &b->feature);
} }
}; };
struct range_record_t { struct hb_ms_range_record_t {
hb_ms_features_t features; hb_ms_features_t features;
unsigned int index_first; /* == start */ unsigned int index_first; /* == start */
unsigned int index_last; /* == end - 1 */ unsigned int index_last; /* == end - 1 */
}; };
HB_INTERNAL static bool HB_INTERNAL static bool
hb_ms_setup_features (const hb_feature_t *features, hb_ms_setup_features (const hb_feature_t *features,
unsigned int num_features, unsigned int num_features,
hb_vector_t<hb_ms_feature_t> &feature_records, /* OUT */ hb_vector_t<hb_ms_feature_t> &feature_records, /* OUT */
hb_vector_t<range_record_t> &range_records /* OUT */) hb_vector_t<hb_ms_range_record_t> &range_records /* OUT */)
{ {
/* Sort features by start/end events. */ /* Sort features by start/end events. */
hb_vector_t<feature_event_t> feature_events; hb_vector_t<hb_ms_feature_event_t> feature_events;
for (unsigned int i = 0; i < num_features; i++) for (unsigned int i = 0; i < num_features; i++)
{ {
active_feature_t feature; hb_ms_active_feature_t feature;
feature.fea.tag = hb_uint32_swap (features[i].tag); feature.fea.tag_le = hb_uint32_swap (features[i].tag);
feature.fea.value = features[i].value; feature.fea.value = features[i].value;
feature.order = i; feature.order = i;
feature_event_t *event; hb_ms_feature_event_t *event;
event = feature_events.push (); event = feature_events.push ();
event->index = features[i].start; event->index = features[i].start;
@ -108,35 +108,34 @@ hb_ms_setup_features (const hb_feature_t *features,
feature_events.qsort (); feature_events.qsort ();
/* Add a strategic final event. */ /* Add a strategic final event. */
{ {
active_feature_t feature; hb_ms_active_feature_t feature;
feature.fea.tag = 0; feature.fea.tag_le = 0;
feature.fea.value = 0; feature.fea.value = 0;
feature.order = num_features + 1; feature.order = num_features + 1;
feature_event_t *event = feature_events.push (); auto *event = feature_events.push ();
event->index = 0; /* This value does magic. */ event->index = 0; /* This value does magic. */
event->start = false; event->start = false;
event->feature = feature; event->feature = feature;
} }
/* Scan events and save features for each range. */ /* Scan events and save features for each range. */
hb_vector_t<active_feature_t> active_features; hb_vector_t<hb_ms_active_feature_t> active_features;
unsigned int last_index = 0; unsigned int last_index = 0;
for (unsigned int i = 0; i < feature_events.length; i++) for (unsigned int i = 0; i < feature_events.length; i++)
{ {
feature_event_t *event = &feature_events[i]; auto *event = &feature_events[i];
if (event->index != last_index) if (event->index != last_index)
{ {
/* Save a snapshot of active features and the range. */ /* Save a snapshot of active features and the range. */
range_record_t *range = range_records.push (); auto *range = range_records.push ();
auto offset = feature_records.length;
unsigned int offset = feature_records.length;
active_features.qsort (); active_features.qsort ();
for (unsigned int j = 0; j < active_features.length; j++) for (unsigned int j = 0; j < active_features.length; j++)
{ {
if (!j || active_features[j].fea.tag != feature_records[feature_records.length - 1].tag) if (!j || active_features[j].fea.tag_le != feature_records[feature_records.length - 1].tag_le)
{ {
feature_records.push (active_features[j].fea); feature_records.push (active_features[j].fea);
} }
@ -163,7 +162,7 @@ hb_ms_setup_features (const hb_feature_t *features,
} }
else else
{ {
active_feature_t *feature = active_features.find (&event->feature); auto *feature = active_features.find (&event->feature);
if (feature) if (feature)
active_features.remove (feature - active_features.arrayZ); active_features.remove (feature - active_features.arrayZ);
} }
@ -175,7 +174,7 @@ hb_ms_setup_features (const hb_feature_t *features,
/* Fixup the pointers. */ /* Fixup the pointers. */
for (unsigned int i = 0; i < range_records.length; i++) for (unsigned int i = 0; i < range_records.length; i++)
{ {
range_record_t *range = &range_records[i]; auto *range = &range_records[i];
range->features.features = (hb_ms_feature_t *) feature_records + reinterpret_cast<uintptr_t> (range->features.features); range->features.features = (hb_ms_feature_t *) feature_records + reinterpret_cast<uintptr_t> (range->features.features);
} }
@ -184,21 +183,21 @@ hb_ms_setup_features (const hb_feature_t *features,
} }
HB_INTERNAL static void HB_INTERNAL static void
hb_ms_make_feature_ranges (hb_vector_t<hb_ms_feature_t> &feature_records, hb_ms_make_feature_ranges (hb_vector_t<hb_ms_feature_t> &feature_records,
hb_vector_t<range_record_t> &range_records, hb_vector_t<hb_ms_range_record_t> &range_records,
unsigned int chars_offset, unsigned int chars_offset,
unsigned int chars_len, unsigned int chars_len,
uint16_t *log_clusters, uint16_t *log_clusters,
hb_vector_t<hb_ms_features_t*> &range_features, /* OUT */ hb_vector_t<hb_ms_features_t*> &range_features, /* OUT */
hb_vector_t<uint32_t> &range_counts /* OUT */) hb_vector_t<uint32_t> &range_counts /* OUT */)
{ {
range_features.shrink (0); range_features.shrink (0);
range_counts.shrink (0); range_counts.shrink (0);
range_record_t *last_range = &range_records[0]; auto *last_range = &range_records[0];
for (unsigned int i = chars_offset; i < chars_len; i++) for (unsigned int i = chars_offset; i < chars_len; i++)
{ {
range_record_t *range = last_range; auto *range = last_range;
while (log_clusters[i] < range->index_first) while (log_clusters[i] < range->index_first)
range--; range--;
while (log_clusters[i] > range->index_last) while (log_clusters[i] > range->index_last)

2
src/hb-uniscribe.cc
View File

@ -723,7 +723,7 @@ retry:
static_assert ((sizeof (TEXTRANGE_PROPERTIES) == sizeof (hb_ms_features_t)), ""); static_assert ((sizeof (TEXTRANGE_PROPERTIES) == sizeof (hb_ms_features_t)), "");
static_assert ((sizeof (OPENTYPE_FEATURE_RECORD) == sizeof (hb_ms_feature_t)), ""); static_assert ((sizeof (OPENTYPE_FEATURE_RECORD) == sizeof (hb_ms_feature_t)), "");
hb_vector_t<hb_ms_feature_t> feature_records; hb_vector_t<hb_ms_feature_t> feature_records;
hb_vector_t<range_record_t> range_records; hb_vector_t<hb_ms_range_record_t> range_records;
bool has_features = false; bool has_features = false;
if (num_features) if (num_features)
has_features = hb_ms_setup_features (features, has_features = hb_ms_setup_features (features,