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

[serializer] Add copy() to (Unsized)ArrayOf

This commit is contained in:
Behdad Esfahbod 2019-05-02 14:39:52 -07:00
parent 88a4147240
commit 998b0b68ac
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/hb-open-type.hh
View File

@ -409,6 +409,36 @@ struct UnsizedArrayOf
void qsort (unsigned int len, unsigned int start = 0, unsigned int end = (unsigned int) -1) void qsort (unsigned int len, unsigned int start = 0, unsigned int end = (unsigned int) -1)
{ as_array (len).qsort (start, end); } { as_array (len).qsort (start, end); }
bool serialize (hb_serialize_context_t *c, unsigned int items_len)
{
TRACE_SERIALIZE (this);
if (unlikely (!c->extend (*this, items_len))) return_trace (false);
return_trace (true);
}
template <typename Iterator,
hb_enable_if (hb_is_iterator_of (Iterator, const Type))>
bool serialize (hb_serialize_context_t *c, Iterator items)
{
TRACE_SERIALIZE (this);
unsigned count = items.len ();
if (unlikely (!serialize (c, count))) return_trace (false);
/* TODO Umm. Just exhaust the iterator instead? Being extra
* cautious right now.. */
for (unsigned i = 0; i < count; i++, items++)
arrayZ[i] = *items;
return_trace (true);
}
UnsizedArrayOf* copy (hb_serialize_context_t *c, unsigned count)
{
TRACE_SERIALIZE (this);
auto *out = c->start_embed (*this);
if (unlikely (!out->serialize (c, count))) return_trace (nullptr);
for (unsigned i = 0; i < count; i++)
out->arrayZ[i] = arrayZ[i]; /* TODO: add version that calls c->copy() */
return_trace (out);
}
bool sanitize (hb_sanitize_context_t *c, unsigned int count) const bool sanitize (hb_sanitize_context_t *c, unsigned int count) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
@ -580,6 +610,17 @@ struct ArrayOf
return_trace (true); return_trace (true);
} }
ArrayOf* copy (hb_serialize_context_t *c)
{
TRACE_SERIALIZE (this);
auto *out = c->start_embed (*this);
unsigned count = len;
if (unlikely (!out->serialize (c, count))) return_trace (nullptr);
for (unsigned i = 0; i < count; i++)
out->arrayZ[i] = arrayZ[i]; /* TODO: add version that calls c->copy() */
return_trace (out);
}
bool sanitize (hb_sanitize_context_t *c) const bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);

4
src/hb-serialize.hh
View File

@ -401,8 +401,8 @@ struct hb_serialize_context_t
template <typename Type> template <typename Type>
Type *extend_min (Type &obj) { return extend_size (obj, obj.min_size); } Type *extend_min (Type &obj) { return extend_size (obj, obj.min_size); }
template <typename Type> template <typename Type, typename ...Ts>
Type *extend (Type &obj) { return extend_size (obj, obj.get_size ()); } Type *extend (Type &obj, Ts &&...ds) { return extend_size (obj, obj.get_size (hb_forward<Ts> (ds)...)); }
/* Output routines. */ /* Output routines. */
hb_bytes_t copy_bytes () const hb_bytes_t copy_bytes () const