From 4f5f1c34dda1e0629bfa6d7b0ffa2e1ce003b7c7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 22 Apr 2010 00:27:39 -0400 Subject: [PATCH] Rename const_sub_array to sub_array since all consts are implicit now --- src/hb-open-type-private.hh | 2 +- src/hb-ot-layout-common-private.hh | 4 ++-- src/hb-ot-layout-gdef-private.hh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh index 7079862f1..8328684f8 100644 --- a/src/hb-open-type-private.hh +++ b/src/hb-open-type-private.hh @@ -521,7 +521,7 @@ struct GenericArrayOf const Type *array(void) const { return &StructAfter (len); } Type *array(void) { return &StructAfter (len); } - const Type *const_sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const + const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const { unsigned int count = len; if (HB_UNLIKELY (start_offset > count)) diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh index 5623de4dd..4e232d46f 100644 --- a/src/hb-ot-layout-common-private.hh +++ b/src/hb-ot-layout-common-private.hh @@ -76,7 +76,7 @@ struct RecordArrayOf : ArrayOf > { hb_tag_t *record_tags /* OUT */) const { if (record_count) { - const Record *array = this->const_sub_array (start_offset, record_count); + const Record *array = this->sub_array (start_offset, record_count); unsigned int count = *record_count; for (unsigned int i = 0; i < count; i++) record_tags[i] = array[i].tag; @@ -129,7 +129,7 @@ struct IndexArray : ArrayOf unsigned int *_indexes /* OUT */) const { if (_count) { - const USHORT *array = this->const_sub_array (start_offset, _count); + const USHORT *array = this->sub_array (start_offset, _count); unsigned int count = *_count; for (unsigned int i = 0; i < count; i++) _indexes[i] = array[i]; diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh index 0122fcc30..4f6c1d9c7 100644 --- a/src/hb-ot-layout-gdef-private.hh +++ b/src/hb-ot-layout-gdef-private.hh @@ -58,7 +58,7 @@ struct AttachList const AttachPoint &points = this+attachPoint[index]; if (point_count) { - const USHORT *array = points.const_sub_array (start_offset, point_count); + const USHORT *array = points.sub_array (start_offset, point_count); unsigned int count = *point_count; for (unsigned int i = 0; i < count; i++) point_array[i] = array[i]; @@ -196,7 +196,7 @@ struct LigGlyph int *caret_array /* OUT */) const { if (caret_count) { - const OffsetTo *array = carets.const_sub_array (start_offset, caret_count); + const OffsetTo *array = carets.sub_array (start_offset, caret_count); unsigned int count = *caret_count; for (unsigned int i = 0; i < count; i++) caret_array[i] = (this+array[i]).get_caret_value (context, glyph_id);