[aat] Rename

pull/730/head
Behdad Esfahbod 6 years ago
parent e42cd58c99
commit 3515c8b187
  1. 12
      src/hb-aat-layout-common.hh

@ -39,7 +39,7 @@ using namespace OT;
* Binary Searching Tables * Binary Searching Tables
*/ */
struct BinSearchHeader struct VarSizedBinSearchHeader
{ {
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
@ -62,7 +62,7 @@ struct BinSearchHeader
}; };
template <typename Type> template <typename Type>
struct BinSearchArrayOf struct VarSizedBinSearchArrayOf
{ {
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (unsigned int i) const
{ {
@ -133,7 +133,7 @@ struct BinSearchArrayOf
} }
protected: protected:
BinSearchHeader header; VarSizedBinSearchHeader header;
UnsizedArrayOf<HBUINT8> bytesZ; UnsizedArrayOf<HBUINT8> bytesZ;
public: public:
DEFINE_SIZE_ARRAY (10, bytesZ); DEFINE_SIZE_ARRAY (10, bytesZ);
@ -213,7 +213,7 @@ struct LookupFormat2
protected: protected:
HBUINT16 format; /* Format identifier--format = 2 */ HBUINT16 format; /* Format identifier--format = 2 */
BinSearchArrayOf<LookupSegmentSingle<T> > VarSizedBinSearchArrayOf<LookupSegmentSingle<T> >
segments; /* The actual segments. These must already be sorted, segments; /* The actual segments. These must already be sorted,
* according to the first word in each one (the last * according to the first word in each one (the last
* glyph in each segment). */ * glyph in each segment). */
@ -270,7 +270,7 @@ struct LookupFormat4
protected: protected:
HBUINT16 format; /* Format identifier--format = 2 */ HBUINT16 format; /* Format identifier--format = 2 */
BinSearchArrayOf<LookupSegmentArray<T> > VarSizedBinSearchArrayOf<LookupSegmentArray<T> >
segments; /* The actual segments. These must already be sorted, segments; /* The actual segments. These must already be sorted,
* according to the first word in each one (the last * according to the first word in each one (the last
* glyph in each segment). */ * glyph in each segment). */
@ -315,7 +315,7 @@ struct LookupFormat6
protected: protected:
HBUINT16 format; /* Format identifier--format = 6 */ HBUINT16 format; /* Format identifier--format = 6 */
BinSearchArrayOf<LookupSingle<T> > VarSizedBinSearchArrayOf<LookupSingle<T> >
entries; /* The actual entries, sorted by glyph index. */ entries; /* The actual entries, sorted by glyph index. */
public: public:
DEFINE_SIZE_ARRAY (8, entries); DEFINE_SIZE_ARRAY (8, entries);

Loading…
Cancel
Save