ref: 0f27de12094c063832d394145f83dd7fffd071f8
parent: 059bcea7ed45aafde3857cf62d47e5bad2a23853
author: Tom Kacvinsky <[email protected]>
date: Tue Jan 2 19:27:46 EST 2001
Merged in changes from t2types.h, and made this the canonical `types' header for the CFF driver.
--- a/include/freetype/internal/cfftypes.h
+++ b/include/freetype/internal/cfftypes.h
@@ -37,7 +37,7 @@
/* A structure used to model a CFF Index table. */
/* */
/* <Fields> */
- /* stream :: source input stream */
+ /* stream :: The source input stream. */
/* */
/* count :: The number of elements in the index. */
/* */
@@ -46,7 +46,7 @@
/* data_offset :: The position of first data byte in the index's */
/* bytes. */
/* */
- /* offsets :: table of element offsets in the index */
+ /* offsets :: A table of element offsets in the index. */
/* */
/* bytes :: If the index is loaded in memory, its bytes. */
/* */
@@ -63,27 +63,26 @@
} CFF_Index;
- /* a compact CFF Charset table */
- typedef struct CFF_Charset_
+ typedef struct CFF_Encoding_
{FT_UInt format;
FT_ULong offset;
-
+
FT_UShort* sids;
+ FT_UShort* codes;
- } CFF_Charset;
+ } CFF_Encoding;
- /* a compact CFF Encoding table */
- typedef struct CFF_Encoding_
+ typedef struct CFF_Charset_
{+
FT_UInt format;
FT_ULong offset;
FT_UShort* sids;
- FT_UShort* codes;
- } CFF_Encoding;
+ } CFF_Charset;
typedef struct CFF_Font_Dict_
@@ -115,9 +114,6 @@
FT_UInt base_font_name;
FT_UInt postscript;
- CFF_Charset charset;
- CFF_Encoding encoding;
-
/* these should only be used for the top-level font dictionary */
FT_UInt cid_registry;
FT_UInt cid_ordering;
@@ -223,8 +219,9 @@
CFF_Index string_index;
CFF_Index global_subrs_index;
- /* we don't load the Encoding and CharSet tables */
-
+ CFF_Encoding encoding;
+ CFF_Charset charset;
+
CFF_Index charstrings_index;
CFF_Index font_dict_index;
CFF_Index private_index;