summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh34
1 files changed, 16 insertions, 18 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
index d9002f3d690..a4d6b0622b3 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-vorg-table.hh
@@ -48,7 +48,7 @@ struct VertOriginMetric
}
public:
- GlyphID glyph;
+ HBGlyphID glyph;
FWORD vertOriginY;
public:
@@ -70,10 +70,10 @@ struct VORG
}
template <typename Iterator,
- hb_requires (hb_is_iterator (Iterator))>
+ hb_requires (hb_is_iterator (Iterator))>
void serialize (hb_serialize_context_t *c,
- Iterator it,
- FWORD defaultVertOriginY)
+ Iterator it,
+ FWORD defaultVertOriginY)
{
if (unlikely (!c->extend_min ((*this)))) return;
@@ -84,9 +84,7 @@ struct VORG
this->defaultVertOriginY = defaultVertOriginY;
this->vertYOrigins.len = it.len ();
- + it
- | hb_apply ([c] (const VertOriginMetric& _) { c->copy (_); })
- ;
+ for (const auto _ : it) c->copy (_);
}
bool subset (hb_subset_context_t *c) const
@@ -99,15 +97,15 @@ struct VORG
+ vertYOrigins.as_array ()
| hb_filter (c->plan->glyphset (), &VertOriginMetric::glyph)
| hb_map ([&] (const VertOriginMetric& _)
- {
- hb_codepoint_t new_glyph = HB_SET_VALUE_INVALID;
- c->plan->new_gid_for_old_gid (_.glyph, &new_glyph);
-
- VertOriginMetric metric;
- metric.glyph = new_glyph;
- metric.vertOriginY = _.vertOriginY;
- return metric;
- })
+ {
+ hb_codepoint_t new_glyph = HB_SET_VALUE_INVALID;
+ c->plan->new_gid_for_old_gid (_.glyph, &new_glyph);
+
+ VertOriginMetric metric;
+ metric.glyph = new_glyph;
+ metric.vertOriginY = _.vertOriginY;
+ return metric;
+ })
;
/* serialize the new table */
@@ -119,8 +117,8 @@ struct VORG
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
- version.major == 1 &&
- vertYOrigins.sanitize (c));
+ version.major == 1 &&
+ vertYOrigins.sanitize (c));
}
protected: