organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-15 01:18:13 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

[vector] Speedup push()

Browse source
This commit is contained in:
Behdad Esfahbod 2023-06-26 11:32:37 -06:00
parent b4b80bcaea
commit f79d961a31
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/hb-subset-cff1.cc
View file

@ -556,13 +556,7 @@ struct cff1_subset_plan
if (sid != last_sid + 1)
{
code_pair_t pair { sid, glyph };
// This is stupid to do manually but it does show speedup.
// We should find up where the slowdown comes from in push()
// and fix it.
if ((int) subset_charset_ranges.length < subset_charset_ranges.allocated)
subset_charset_ranges.arrayZ[subset_charset_ranges.length++] = pair;
else
subset_charset_ranges.push (pair);
subset_charset_ranges.push (pair);
}
last_sid = sid;
}

5
src/hb-vector.hh
View file

@ -228,15 +228,14 @@ struct hb_vector_t
hb_enable_if (std::is_copy_constructible<T2>::value)>
Type *push (T&& v)
{
if (unlikely (!alloc (length + 1)))
if (unlikely ((int) length >= allocated && !alloc (length + 1)))
// If push failed to allocate then don't copy v, since this may cause
// the created copy to leak memory since we won't have stored a
// reference to it.
return std::addressof (Crap (Type));
/* Emplace. */
length++;
Type *p = std::addressof (arrayZ[length - 1]);
Type *p = std::addressof (arrayZ[length++]);
return new (p) Type (std::forward<T> (v));
}