diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-01-05 12:31:24 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-01-05 12:31:24 +0000 |
commit | cb430d8e1759789183f71068480cbc2911de2b0c (patch) | |
tree | e0b1ab7e33690319f17f6dd051261ffe03053760 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh | |
parent | 7d12f6c9702c1933ced5c3077b5e20ef4567233a (diff) |
harfbuzz 1.4.0
git-svn-id: svn://tug.org/texlive/trunk@42866 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh index 66f1c08df45..2cc1fb20d25 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type-private.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/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> |