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

Minor renaming

This commit is contained in:
Behdad Esfahbod 2008-01-23 17:25:29 -05:00
parent a16ecbf056
commit aefaafe5bc
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,14 +201,14 @@ struct LigCaretList {
DEFINE_NULL_ASSERT_SIZE (LigCaretList, 4); DEFINE_NULL_ASSERT_SIZE (LigCaretList, 4);
/* /*
* GDEF Header * GDEF
*/ */
struct GDEFHeader { struct GDEF {
static const hb_tag_t GDEFTag = HB_TAG ('G','D','E','F'); static const hb_tag_t GDEFTag = HB_TAG ('G','D','E','F');
STATIC_DEFINE_GET_FOR_DATA (GDEFHeader); STATIC_DEFINE_GET_FOR_DATA (GDEF);
/* XXX check version here */ /* XXX check version here? */
DEFINE_ACCESSOR (ClassDef, get_glyph_class_def, glyphClassDef); DEFINE_ACCESSOR (ClassDef, get_glyph_class_def, glyphClassDef);
DEFINE_ACCESSOR (AttachList, get_attach_list, attachList); DEFINE_ACCESSOR (AttachList, get_attach_list, attachList);
@ -247,6 +247,6 @@ struct GDEFHeader {
* mark attachment type--from beginning * mark attachment type--from beginning
* of GDEF header (may be Null) */ * of GDEF header (may be Null) */
}; };
DEFINE_NULL_ASSERT_SIZE (GDEFHeader, 12); DEFINE_NULL_ASSERT_SIZE (GDEF, 12);
#endif /* HB_OT_LAYOUT_GDEF_PRIVATE_H */ #endif /* HB_OT_LAYOUT_GDEF_PRIVATE_H */

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

@ -336,7 +336,7 @@ DEFINE_NULL_ALIAS (OpenTypeFontFace, OffsetTable);
struct TTCHeader { struct TTCHeader {
/* OpenTypeFontFaces, in no particular order */ /* OpenTypeFontFaces, in no particular order */
DEFINE_OFFSET_ARRAY_TYPE (OffsetTable, offsetTable, numFonts); DEFINE_OFFSET_ARRAY_TYPE (OffsetTable, offsetTable, numFonts);
/* XXX check version here */ /* XXX check version here? */
private: private:
Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */
@ -788,15 +788,15 @@ struct Device {
DEFINE_NULL_ASSERT_SIZE (Device, 6); DEFINE_NULL_ASSERT_SIZE (Device, 6);
/* /*
* GSUB/GPOS Header * GSUB/GPOS Common
*/ */
typedef struct GSUBGPOSHeader { typedef struct GSUBGPOS {
static const hb_tag_t GSUBTag = HB_TAG ('G','S','U','B'); static const hb_tag_t GSUBTag = HB_TAG ('G','S','U','B');
static const hb_tag_t GPOSTag = HB_TAG ('G','P','O','S'); static const hb_tag_t GPOSTag = HB_TAG ('G','P','O','S');
STATIC_DEFINE_GET_FOR_DATA (GSUBGPOSHeader); STATIC_DEFINE_GET_FOR_DATA (GSUBGPOS);
/* XXX check version here */ /* XXX check version here? */
DEFINE_LIST_ACCESSOR(Script, script); /* get_script_list, get_script(i) */ DEFINE_LIST_ACCESSOR(Script, script); /* get_script_list, get_script(i) */
DEFINE_LIST_ACCESSOR(Feature, feature);/* get_feature_list, get_feature(i) */ DEFINE_LIST_ACCESSOR(Feature, feature);/* get_feature_list, get_feature(i) */
@ -813,9 +813,7 @@ typedef struct GSUBGPOSHeader {
* GSUB/GPOS table */ * GSUB/GPOS table */
Offset lookupList; /* Offset to LookupList table--from beginning of Offset lookupList; /* Offset to LookupList table--from beginning of
* GSUB/GPOS table */ * GSUB/GPOS table */
} GSUBHeader, GPOSHeader; };
DEFINE_NULL_ASSERT_SIZE (GSUBGPOSHeader, 10); DEFINE_NULL_ASSERT_SIZE (GSUBGPOS, 10);
DEFINE_NULL_ALIAS (GSUBHeader, GSUBGPOSHeader);
DEFINE_NULL_ALIAS (GPOSHeader, GSUBGPOSHeader);
#endif /* HB_OT_LAYOUT_OPEN_PRIVATE_H */ #endif /* HB_OT_LAYOUT_OPEN_PRIVATE_H */

4
src/main.cc
View File

@ -76,7 +76,7 @@ main (int argc, char **argv)
(const char *)table.get_tag(), table.get_offset(), table.get_length()); (const char *)table.get_tag(), table.get_offset(), table.get_length());
if (table.get_tag() == "GSUB" || table.get_tag() == "GPOS") { if (table.get_tag() == "GSUB" || table.get_tag() == "GPOS") {
const GSUBGPOSHeader &g = GSUBGPOSHeader::get_for_data (ot[table]); const GSUBGPOS &g = GSUBGPOS::get_for_data (ot[table]);
const ScriptList &scripts = g.get_script_list(); const ScriptList &scripts = g.get_script_list();
int num_scripts = scripts.get_len (); int num_scripts = scripts.get_len ();
@ -119,7 +119,7 @@ main (int argc, char **argv)
lookup.get_type(), lookup.get_flag()); lookup.get_type(), lookup.get_flag());
} }
} else if (table.get_tag() == "GDEF") { } else if (table.get_tag() == "GDEF") {
const GDEFHeader &gdef = GDEFHeader::get_for_data (ot[table]); const GDEF &gdef = GDEF::get_for_data (ot[table]);
for (int glyph = 0; glyph < 1; glyph++) for (int glyph = 0; glyph < 1; glyph++)
printf (" glyph %d has class %d and mark attachment type %d\n", printf (" glyph %d has class %d and mark attachment type %d\n",