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

Fix previous commit, ouch!

This commit is contained in:
Behdad Esfahbod 2009-11-04 16:59:50 -05:00
parent e21899bc35
commit 48de3730cd
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-open-type-private.hh
View File

@ -511,6 +511,18 @@ struct GenericArrayOf
const Type *const_array(void) const { return CONST_ARRAY_AFTER (Type, len); } const Type *const_array(void) const { return CONST_ARRAY_AFTER (Type, len); }
Type *array(void) { return ARRAY_AFTER (Type, len); } Type *array(void) { return ARRAY_AFTER (Type, len); }
const Type *const_sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const
{
unsigned int count = len;
if (HB_UNLIKELY (start_offset > count))
count = 0;
else
count -= start_offset;
count = MIN (count, *pcount);
*pcount = count;
return const_array() + start_offset;
}
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (unsigned int i) const
{ {
if (HB_UNLIKELY (i >= len)) return Null(Type); if (HB_UNLIKELY (i >= len)) return Null(Type);

12
src/hb-ot-layout-common-private.hh
View File

@ -74,12 +74,10 @@ struct RecordArrayOf : ArrayOf<Record<Type> > {
hb_tag_t *record_tags /* OUT */) const hb_tag_t *record_tags /* OUT */) const
{ {
if (record_count) { if (record_count) {
unsigned int count = MIN (MIN (0, (unsigned int) this->len - start_offset), *record_count); const Record<Type> *array = this->const_sub_array (start_offset, record_count);
const Record<Type> *array = this->const_array() + start_offset; unsigned int count = *record_count;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
record_tags[i] = array[i].tag; record_tags[i] = array[i].tag;
*record_count = this->len;
} }
return this->len; return this->len;
} }
@ -128,12 +126,10 @@ struct IndexArray : ArrayOf<USHORT>
unsigned int *_indexes /* OUT */) const unsigned int *_indexes /* OUT */) const
{ {
if (_count) { if (_count) {
unsigned int count = MIN (MIN (0, (unsigned int) this->len - start_offset), *_count); const USHORT *array = this->const_sub_array (start_offset, _count);
const USHORT *array = this->const_array() + start_offset; unsigned int count = *_count;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
_indexes[i] = array[i]; _indexes[i] = array[i];
*_count = this->len;
} }
return this->len; return this->len;
} }

12
src/hb-ot-layout-gdef-private.hh
View File

@ -58,12 +58,10 @@ struct AttachList
const AttachPoint &points = this+attachPoint[index]; const AttachPoint &points = this+attachPoint[index];
if (point_count) { if (point_count) {
const USHORT *array = points.const_array () + start_offset; const USHORT *array = points.const_sub_array (start_offset, point_count);
unsigned int count = MIN (MIN (0, (unsigned int) points.len - start_offset), *point_count); unsigned int count = *point_count;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
point_array[i] = array[i]; point_array[i] = array[i];
*point_count = points.len;
} }
return points.len; return points.len;
@ -198,12 +196,10 @@ struct LigGlyph
int *caret_array /* OUT */) const int *caret_array /* OUT */) const
{ {
if (caret_count) { if (caret_count) {
const OffsetTo<CaretValue> *array = carets.const_array () + start_offset; const OffsetTo<CaretValue> *array = carets.const_sub_array (start_offset, caret_count);
unsigned int count = MIN (MIN (0, (unsigned int) carets.len - start_offset), *caret_count); unsigned int count = *caret_count;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
caret_array[i] = (this+array[i]).get_caret_value (context, glyph_id); caret_array[i] = (this+array[i]).get_caret_value (context, glyph_id);
*caret_count = carets.len;
} }
return carets.len; return carets.len;