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

[HB] Remove unused data types

This commit is contained in:
Behdad Esfahbod 2009-05-24 01:03:24 -04:00
parent 5876bf1b73
commit 87fcdcbe36
3 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-layout-gdef-private.h
View File

@ -208,7 +208,7 @@ struct GDEF
inline bool has_lig_caret_list () const { return ligCaretList != 0; } inline bool has_lig_caret_list () const { return ligCaretList != 0; }
private: private:
Fixed_Version version; /* Version of the GDEF table--initially FixedVersion version; /* Version of the GDEF table--initially
* 0x00010000 */ * 0x00010000 */
OffsetTo<ClassDef> OffsetTo<ClassDef>
glyphClassDef; /* Offset to class definition table glyphClassDef; /* Offset to class definition table

2
src/hb-ot-layout-gsubgpos-private.h
View File

@ -758,7 +758,7 @@ struct GSUBGPOS
DEFINE_TAG_FIND_INTERFACE (Feature, feature); /* find_feature_index(), get_feature_by_tag(tag) */ DEFINE_TAG_FIND_INTERFACE (Feature, feature); /* find_feature_index(), get_feature_by_tag(tag) */
protected: protected:
Fixed_Version version; /* Version of the GSUB/GPOS table--initially set FixedVersion version; /* Version of the GSUB/GPOS table--initially set
* to 0x00010000 */ * to 0x00010000 */
OffsetTo<ScriptList> OffsetTo<ScriptList>
scriptList; /* ScriptList table */ scriptList; /* ScriptList table */

54
src/hb-ot-layout-open-private.h
View File

@ -179,7 +179,7 @@ struct Null <Type> \
{ \ { \
if (HB_UNLIKELY (data == NULL)) return Null(Type); \ if (HB_UNLIKELY (data == NULL)) return Null(Type); \
const Type& t = (const Type&)*data; \ const Type& t = (const Type&)*data; \
if (HB_UNLIKELY (t.version.major () != Major)) return Null(Type); \ if (HB_UNLIKELY (t.version.major != Major)) return Null(Type); \
return t; \ return t; \
} }
@ -222,52 +222,11 @@ struct Null <Type> \
ASSERT_SIZE (NAME, w / 8) ASSERT_SIZE (NAME, w / 8)
DEFINE_INT_TYPE_STRUCT (BYTE, u, 8); /* 8-bit unsigned integer. */
DEFINE_INT_TYPE_STRUCT (CHAR, , 8); /* 8-bit signed integer. */
DEFINE_INT_TYPE_STRUCT (USHORT, u, 16); /* 16-bit unsigned integer. */ DEFINE_INT_TYPE_STRUCT (USHORT, u, 16); /* 16-bit unsigned integer. */
DEFINE_INT_TYPE_STRUCT (SHORT, , 16); /* 16-bit signed integer. */ DEFINE_INT_TYPE_STRUCT (SHORT, , 16); /* 16-bit signed integer. */
DEFINE_INT_TYPE_STRUCT (ULONG, u, 32); /* 32-bit unsigned integer. */ DEFINE_INT_TYPE_STRUCT (ULONG, u, 32); /* 32-bit unsigned integer. */
DEFINE_INT_TYPE_STRUCT (LONG, , 32); /* 32-bit signed integer. */ DEFINE_INT_TYPE_STRUCT (LONG, , 32); /* 32-bit signed integer. */
/* Date represented in number of seconds since 12:00 midnight, January 1,
* 1904. The value is represented as a signed 64-bit integer. */
DEFINE_INT_TYPE_STRUCT (LONGDATETIME, , 64);
/* 32-bit signed fixed-point number (16.16) */
struct Fixed
{
inline Fixed& operator = (int32_t v) { i = (int16_t) (v >> 16); f = (uint16_t) v; return *this; } \
inline operator int32_t(void) const { return (((int32_t) i) << 16) + (uint16_t) f; } \
inline bool operator== (Fixed o) const { return i == o.i && f == o.f; } \
inline operator double(void) const { return (uint32_t) this / 65536.; }
inline int16_t int_part (void) const { return i; }
inline uint16_t frac_part (void) const { return f; }
private:
SHORT i;
USHORT f;
};
ASSERT_SIZE (Fixed, 4);
/* Smallest measurable distance in the em space. */
struct FUNIT;
/* 16-bit signed integer (SHORT) that describes a quantity in FUnits. */
struct FWORD : SHORT {};
ASSERT_SIZE (FWORD, 2);
/* 16-bit unsigned integer (USHORT) that describes a quantity in FUnits. */
struct UFWORD : USHORT {};
ASSERT_SIZE (UFWORD, 2);
/* 16-bit signed fixed number with the low 14 bits of fraction (2.14). */
struct F2DOT14 : SHORT
{
inline operator double() const { return (uint32_t) this / 16384.; }
};
ASSERT_SIZE (F2DOT14, 2);
/* Array of four uint8s (length = 32 bits) used to identify a script, language /* Array of four uint8s (length = 32 bits) used to identify a script, language
* system, feature, or baseline */ * system, feature, or baseline */
struct Tag struct Tag
@ -332,15 +291,12 @@ ASSERT_SIZE (CheckSum, 4);
* Version Numbers * Version Numbers
*/ */
struct USHORT_Version : USHORT {}; struct FixedVersion
ASSERT_SIZE (USHORT_Version, 2);
struct Fixed_Version : Fixed
{ {
inline int16_t major (void) const { return this->int_part(); } SHORT major;
inline int16_t minor (void) const { return this->frac_part(); } USHORT minor;
}; };
ASSERT_SIZE (Fixed_Version, 4); ASSERT_SIZE (FixedVersion, 4);
/* /*
* Array Types * Array Types