src/hb-private.hh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
New commits: commit 56ef4e0c52d5b474518bf0c1e4adba80f2ae6946 Author: Behdad Esfahbod <[email protected]> Date: Sun Oct 15 16:38:29 2017 -0400 Simplify hb_prealloced_array_t initialization diff --git a/src/hb-private.hh b/src/hb-private.hh index 3cf8b8d3..5deaa9d9 100644 --- a/src/hb-private.hh +++ b/src/hb-private.hh @@ -404,7 +404,12 @@ struct hb_prealloced_array_t Type *array; Type static_array[StaticSize]; - void init (void) { memset (this, 0, sizeof (*this)); } + void init (void) + { + len = 0; + allocated = ARRAY_LENGTH (static_array); + array = static_array; + } inline Type& operator [] (unsigned int i) { return array[i]; } inline const Type& operator [] (unsigned int i) const { return array[i]; } @@ -419,11 +424,7 @@ struct hb_prealloced_array_t inline bool resize (unsigned int size) { - if (!array) { - array = static_array; - allocated = ARRAY_LENGTH (static_array); - } - if (size > allocated) + if (unlikely (size > allocated)) { /* Need to reallocate */ _______________________________________________ HarfBuzz mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/harfbuzz
