Rename const_sub_array to sub_array since all consts are implicit now

pull/1/head
Behdad Esfahbod 15 years ago
parent 0795b784dd
commit 4f5f1c34dd
  1. 2
      src/hb-open-type-private.hh
  2. 4
      src/hb-ot-layout-common-private.hh
  3. 4
      src/hb-ot-layout-gdef-private.hh

@ -521,7 +521,7 @@ struct GenericArrayOf
const Type *array(void) const { return &StructAfter<Type> (len); }
Type *array(void) { return &StructAfter<Type> (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))

@ -76,7 +76,7 @@ struct RecordArrayOf : ArrayOf<Record<Type> > {
hb_tag_t *record_tags /* OUT */) const
{
if (record_count) {
const Record<Type> *array = this->const_sub_array (start_offset, record_count);
const Record<Type> *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<USHORT>
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];

@ -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<CaretValue> *array = carets.const_sub_array (start_offset, caret_count);
const OffsetTo<CaretValue> *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);

Loading…
Cancel
Save