| Index: third_party/harfbuzz-ng/src/hb-open-type-private.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-open-type-private.hh b/third_party/harfbuzz-ng/src/hb-open-type-private.hh
|
| index 66f1c08df45a74e18e093aa524bc3a8ea793bef2..2cc1fb20d250463f7e6c0cdd89b011397f020946 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-open-type-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-open-type-private.hh
|
| @@ -105,7 +105,7 @@ static inline Type& StructAfter(TObject &X)
|
| inline unsigned int get_size (void) const { return (size); }
|
|
|
| #define DEFINE_SIZE_UNION(size, _member) \
|
| - DEFINE_INSTANCE_ASSERTION (this->u._member.static_size == (size)); \
|
| + DEFINE_INSTANCE_ASSERTION (0*sizeof(this->u._member.static_size) + sizeof(this->u._member) == (size)); \
|
| static const unsigned int min_size = (size)
|
|
|
| #define DEFINE_SIZE_MIN(size) \
|
| @@ -652,6 +652,7 @@ struct IntType
|
|
|
| typedef IntType<int8_t , 1> CHAR; /* 8-bit signed integer. */
|
| typedef IntType<uint8_t , 1> BYTE; /* 8-bit unsigned integer. */
|
| +typedef IntType<int8_t , 1> INT8; /* 8-bit signed integer. */
|
| typedef IntType<uint16_t, 2> USHORT; /* 16-bit unsigned integer. */
|
| typedef IntType<int16_t, 2> SHORT; /* 16-bit signed integer. */
|
| typedef IntType<uint32_t, 4> ULONG; /* 32-bit unsigned integer. */
|
| @@ -951,8 +952,8 @@ struct ArrayOf
|
| };
|
|
|
| /* Array of Offset's */
|
| -template <typename Type>
|
| -struct OffsetArrayOf : ArrayOf<OffsetTo<Type> > {};
|
| +template <typename Type, typename OffsetType=USHORT>
|
| +struct OffsetArrayOf : ArrayOf<OffsetTo<Type, OffsetType> > {};
|
|
|
| /* Array of offsets relative to the beginning of the array itself. */
|
| template <typename Type>
|
|
|