rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

still more logical transformations. This time, some public API headers have 

been touched, while keeping everything backwards-compatible..

        * include/freetype/t1tables.h: re-naming structure types. This done
        basically:

          typedef T1_Struct_
          {
          } T1_Struct;

        becomes:

          typedef PS_StructRec_
          {
          } PS_StructRec, *PS_Struct;

          typedef PS_StructRec  T1_Struct;  /* backwards-compatibility */


        hence, we increase the coherency of the source code by effectuively
        using the 'Rec' prefix for structure types..
This commit is contained in:
David Turner 2002-02-28 18:59:37 +00:00
parent 4e7eeeec7b
commit 29644179cc
26 changed files with 302 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,5 +1,27 @@
2002-02-28 David Turner <david@freetype.org> 2002-02-28 David Turner <david@freetype.org>
* include/freetype/t1tables.h: re-naming structure types. This done
basically:
typedef T1_Struct_
{
} T1_Struct;
becomes:
typedef PS_StructRec_
{
} PS_StructRec, *PS_Struct;
typedef PS_StructRec T1_Struct; /* backwards-compatibility */
hence, we increase the coherency of the source code by effectuively
using the 'Rec' prefix for structure types..
2002-02-27 David Turner <david@freetype.org>
* src/sfnt/ttload.c (TT_Load_Names): simplifying and securing the * src/sfnt/ttload.c (TT_Load_Names): simplifying and securing the
names table loader. Invalid individual name entries are now handled names table loader. Invalid individual name entries are now handled
correctly. This allows the loading of very buggy fonts like correctly. This allows the loading of very buggy fonts like

36
include/freetype/internal/cfftypes.h
View File

@ -31,7 +31,7 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */
/* CFF_Index */ /* CFF_IndexRec */
/* */ /* */
/* <Description> */ /* <Description> */
/* A structure used to model a CFF Index table. */ /* A structure used to model a CFF Index table. */
@ -50,7 +50,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* bytes :: If the index is loaded in memory, its bytes. */ /* bytes :: If the index is loaded in memory, its bytes. */
/* */ /* */
typedef struct CFF_Index_ typedef struct CFF_IndexRec_
{ {
FT_Stream stream; FT_Stream stream;
FT_UInt count; FT_UInt count;
@ -60,10 +60,10 @@ FT_BEGIN_HEADER
FT_ULong* offsets; FT_ULong* offsets;
FT_Byte* bytes; FT_Byte* bytes;
} CFF_Index; } CFF_IndexRec, *CFF_Index;
typedef struct CFF_Encoding_ typedef struct CFF_EncodingRec_
{ {
FT_UInt format; FT_UInt format;
FT_ULong offset; FT_ULong offset;
@ -71,7 +71,7 @@ FT_BEGIN_HEADER
FT_UShort* sids; FT_UShort* sids;
FT_UShort* codes; FT_UShort* codes;
} CFF_Encoding; } CFF_EncodingRec, *CFF_Encoding;
typedef struct CFF_Charset_ typedef struct CFF_Charset_
@ -132,7 +132,7 @@ FT_BEGIN_HEADER
} CFF_Font_Dict; } CFF_Font_Dict;
typedef struct CFF_Private_ typedef struct CFF_PrivateRec_
{ {
FT_Byte num_blue_values; FT_Byte num_blue_values;
FT_Byte num_other_blues; FT_Byte num_other_blues;
@ -164,7 +164,7 @@ FT_BEGIN_HEADER
FT_Pos default_width; FT_Pos default_width;
FT_Pos nominal_width; FT_Pos nominal_width;
} CFF_Private; } CFF_PrivateRec, *CFF_Private;
typedef struct CFF_FD_Select_ typedef struct CFF_FD_Select_
@ -189,9 +189,9 @@ FT_BEGIN_HEADER
typedef struct CFF_SubFont_ typedef struct CFF_SubFont_
{ {
CFF_Font_Dict font_dict; CFF_Font_Dict font_dict;
CFF_Private private_dict; CFF_PrivateRec private_dict;
CFF_Index local_subrs_index; CFF_IndexRec local_subrs_index;
FT_UInt num_local_subrs; FT_UInt num_local_subrs;
FT_Byte** local_subrs; FT_Byte** local_subrs;
@ -215,18 +215,18 @@ FT_BEGIN_HEADER
FT_Byte absolute_offsize; FT_Byte absolute_offsize;
CFF_Index name_index; CFF_IndexRec name_index;
CFF_Index top_dict_index; CFF_IndexRec top_dict_index;
CFF_Index string_index; CFF_IndexRec string_index;
CFF_Index global_subrs_index; CFF_IndexRec global_subrs_index;
CFF_Encoding encoding; CFF_EncodingRec encoding;
CFF_Charset charset; CFF_Charset charset;
CFF_Index charstrings_index; CFF_IndexRec charstrings_index;
CFF_Index font_dict_index; CFF_IndexRec font_dict_index;
CFF_Index private_index; CFF_IndexRec private_index;
CFF_Index local_subrs_index; CFF_IndexRec local_subrs_index;
FT_String* font_name; FT_String* font_name;
FT_UInt num_global_subrs; FT_UInt num_global_subrs;

4
include/freetype/internal/psaux.h
View File

@ -602,7 +602,7 @@ FT_BEGIN_HEADER
FT_Size size, FT_Size size,
FT_GlyphSlot slot, FT_GlyphSlot slot,
FT_Byte** glyph_names, FT_Byte** glyph_names,
T1_Blend* blend, PS_Blend blend,
FT_Bool hinting, FT_Bool hinting,
T1_Decoder_Callback callback ); T1_Decoder_Callback callback );
@ -643,7 +643,7 @@ FT_BEGIN_HEADER
FT_Int num_flex_vectors; FT_Int num_flex_vectors;
FT_Vector flex_vectors[7]; FT_Vector flex_vectors[7];
T1_Blend* blend; /* for multiple master support */ PS_Blend blend; /* for multiple master support */
T1_Decoder_Callback parse_callback; T1_Decoder_Callback parse_callback;
T1_Decoder_FuncsRec funcs; T1_Decoder_FuncsRec funcs;

38
include/freetype/internal/t1types.h
View File

@ -46,7 +46,7 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */
/* T1_Encoding */ /* T1_EncodingRec */
/* */ /* */
/* <Description> */ /* <Description> */
/* A structure modeling a custom encoding. */ /* A structure modeling a custom encoding. */
@ -63,7 +63,7 @@ FT_BEGIN_HEADER
/* */ /* */
/* char_name :: An array of corresponding glyph names. */ /* char_name :: An array of corresponding glyph names. */
/* */ /* */
typedef struct T1_Encoding_ typedef struct T1_EncodingRecRec_
{ {
FT_Int num_chars; FT_Int num_chars;
FT_Int code_first; FT_Int code_first;
@ -72,33 +72,33 @@ FT_BEGIN_HEADER
FT_UShort* char_index; FT_UShort* char_index;
FT_String** char_name; FT_String** char_name;
} T1_Encoding; } T1_EncodingRec, *T1_Encoding;
typedef enum T1_EncodingType_ typedef enum T1_EncodingType_
{ {
t1_encoding_none = 0, T1_ENCODING_TYPE_NONE = 0,
t1_encoding_array, T1_ENCODING_TYPE_ARRAY,
t1_encoding_standard, T1_ENCODING_TYPE_STANDARD,
t1_encoding_isolatin1, T1_ENCODING_TYPE_ISOLATIN1,
t1_encoding_expert T1_ENCODING_TYPE_EXPORT
} T1_EncodingType; } T1_EncodingType;
typedef struct T1_Font_ typedef struct T1_FontRec_
{ {
/* font info dictionary */ /* font info dictionary */
T1_FontInfo font_info; PS_FontInfoRec font_info;
/* private dictionary */ /* private dictionary */
T1_Private private_dict; PS_PrivateRec private_dict;
/* top-level dictionary */ /* top-level dictionary */
FT_String* font_name; FT_String* font_name;
T1_EncodingType encoding_type; T1_EncodingType encoding_type;
T1_Encoding encoding; T1_EncodingRec encoding;
FT_Byte* subrs_block; FT_Byte* subrs_block;
FT_Byte* charstrings_block; FT_Byte* charstrings_block;
@ -122,15 +122,15 @@ FT_BEGIN_HEADER
FT_Int stroke_width; FT_Int stroke_width;
} T1_Font; } T1_FontRec, *T1_Font;
typedef struct CID_Subrs_ typedef struct CID_SubrsRec_
{ {
FT_UInt num_subrs; FT_UInt num_subrs;
FT_Byte** code; FT_Byte** code;
} CID_Subrs; } CID_SubrsRec, *CID_Subrs;
/*************************************************************************/ /*************************************************************************/
@ -164,7 +164,7 @@ FT_BEGIN_HEADER
typedef struct T1_FaceRec_ typedef struct T1_FaceRec_
{ {
FT_FaceRec root; FT_FaceRec root;
T1_Font type1; T1_FontRec type1;
void* psnames; void* psnames;
void* psaux; void* psaux;
void* afm_data; void* afm_data;
@ -173,7 +173,7 @@ FT_BEGIN_HEADER
PS_Unicodes unicode_map; PS_Unicodes unicode_map;
/* support for Multiple Masters fonts */ /* support for Multiple Masters fonts */
T1_Blend* blend; PS_Blend blend;
/* since FT 2.1 - interface to PostScript hinter */ /* since FT 2.1 - interface to PostScript hinter */
void* pshinter; void* pshinter;
@ -186,9 +186,9 @@ FT_BEGIN_HEADER
FT_FaceRec root; FT_FaceRec root;
void* psnames; void* psnames;
void* psaux; void* psaux;
CID_Info cid; CID_FaceInfoRec cid;
void* afm_data; void* afm_data;
CID_Subrs* subrs; CID_Subrs subrs;
/* since FT 2.1 - interface to PostScript hinter */ /* since FT 2.1 - interface to PostScript hinter */
void* pshinter; void* pshinter;

141
include/freetype/t1tables.h
View File

@ -46,21 +46,21 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* Note that we separate font data in T1_FontInfo and T1_Private */ /* Note that we separate font data in PS_FontInfoRec and PS_PrivateRec */
/* structures in order to support Multiple Master fonts. */ /* structures in order to support Multiple Master fonts. */
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */
/* T1_FontInfo */ /* PS_FontInfoRec */
/* */ /* */
/* <Description> */ /* <Description> */
/* A structure used to model a Type1/Type2 FontInfo dictionary. Note */ /* A structure used to model a Type1/Type2 FontInfo dictionary. Note */
/* that for Multiple Master fonts, each instance has its own */ /* that for Multiple Master fonts, each instance has its own */
/* FontInfo. */ /* FontInfo. */
/* */ /* */
typedef struct T1_FontInfo typedef struct PS_FontInfoRec
{ {
FT_String* version; FT_String* version;
FT_String* notice; FT_String* notice;
@ -72,20 +72,33 @@ FT_BEGIN_HEADER
FT_Short underline_position; FT_Short underline_position;
FT_UShort underline_thickness; FT_UShort underline_thickness;
} T1_FontInfo; } PS_FontInfoRec, *PS_FontInfo;
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */
/* T1_Private */ /* T1_FontInfo */
/* */ /* */
/* <Description> */ /* <Description> */
/* A structure used to model a Type1/Type2 FontInfo dictionary. Note */ /* this type is equivalent to @PS_FontInfoRec but has been deprecated */
/* it is kept to maintain source compatibility between various */
/* versions of FreeType */
/* */
typedef PS_FontInfoRec T1_FontInfo;
/*************************************************************************/
/* */
/* <Struct> */
/* PS_PrivateRec */
/* */
/* <Description> */
/* A structure used to model a Type1/Type2 private dictionary. Note */
/* that for Multiple Master fonts, each instance has its own Private */ /* that for Multiple Master fonts, each instance has its own Private */
/* dict. */ /* dict. */
/* */ /* */
typedef struct T1_Private typedef struct PS_PrivateRec_
{ {
FT_Int unique_id; FT_Int unique_id;
FT_Int lenIV; FT_Int lenIV;
@ -121,7 +134,20 @@ FT_BEGIN_HEADER
FT_Short min_feature[2]; FT_Short min_feature[2];
} T1_Private; } PS_PrivateRec, *PS_Private;
/*************************************************************************/
/* */
/* <Struct> */
/* T1_Private */
/* */
/* <Description> */
/* this type is equivalent to @PS_PrivateRec but has been deprecated */
/* it is kept to maintain source compatibility between various */
/* versions of FreeType */
/* */
typedef PS_PrivateRec T1_Private;
/*************************************************************************/ /*************************************************************************/
@ -137,29 +163,47 @@ FT_BEGIN_HEADER
typedef enum typedef enum
{ {
/*# required fields in a FontInfo blend dictionary */ /*# required fields in a FontInfo blend dictionary */
t1_blend_underline_position = 0, T1_BLEND_UNDERLINE_POSITION = 0,
t1_blend_underline_thickness, T1_BLEND_UNDERLINE_THICKNESS,
t1_blend_italic_angle, T1_BLEND_ITALIC_ANGLE,
/*# required fields in a Private blend dictionary */ /*# required fields in a Private blend dictionary */
t1_blend_blue_values, T1_BLEND_BLUE_VALUES,
t1_blend_other_blues, T1_BLEND_OTHER_BLUES,
t1_blend_standard_width, T1_BLEND_STANDARD_WIDTH,
t1_blend_standard_height, T1_BLEND_STANDARD_HEIGHT,
t1_blend_stem_snap_widths, T1_BLEND_STEM_SNAP_WIDTHS,
t1_blend_stem_snap_heights, T1_BLEND_STEM_SNAP_HEIGHTS,
t1_blend_blue_scale, T1_BLEND_BLUE_SCALE,
t1_blend_blue_shift, T1_BLEND_BLUE_SHIFT,
t1_blend_family_blues, T1_BLEND_FAMILY_BLUES,
t1_blend_family_other_blues, T1_BLEND_FAMILY_OTHER_BLUES,
t1_blend_force_bold, T1_BLEND_FORCE_BOLD,
/*# never remove */ /*# never remove */
t1_blend_max T1_BLEND_MAX
} T1_Blend_Flags; } T1_Blend_Flags;
/* backwards compatible definitions */
#define t1_blend_underline_position T1_BLEND_UNDERLINE_POSITION
#define t1_blend_underline_thickness T1_BLEND_UNDERLINE_THICKNESS
#define t1_blend_italic_angle T1_BLEND_ITALIC_ANGLE
#define t1_blend_blue_values T1_BLEND_BLUE_VALUES
#define t1_blend_other_blues T1_BLEND_OTHER_BLUES
#define t1_blend_standard_widths T1_BLEND_STANDARD_WIDTH
#define t1_blend_standard_height T1_BLEND_STANDARD_HEIGHT
#define t1_blend_stem_snap_widths T1_BLEND_STEM_SNAP_WIDTHS
#define t1_blend_stem_snap_heights T1_BLEND_STEM_SNAP_HEIGHTS
#define t1_blend_blue_scale T1_BLEND_BLUE_SCALE
#define t1_blend_blue_shift T1_BLEND_BLUE_SHIFT
#define t1_blend_family_blues T1_BLEND_FAMILY_BLUES
#define t1_blend_family_other_blues T1_BLEND_FAMILY_OTHER_BLUES
#define t1_blend_force_bold T1_BLEND_FORCE_BOLD
#define t1_blend_max T1_BELND_MAX
/* maximum number of Multiple Masters designs, as defined in the spec */ /* maximum number of Multiple Masters designs, as defined in the spec */
#define T1_MAX_MM_DESIGNS 16 #define T1_MAX_MM_DESIGNS 16
@ -171,38 +215,45 @@ FT_BEGIN_HEADER
/* this structure is used to store the BlendDesignMap entry for an axis */ /* this structure is used to store the BlendDesignMap entry for an axis */
typedef struct T1_DesignMap_ typedef struct PS_DesignMap_
{ {
FT_Byte num_points; FT_Byte num_points;
FT_Fixed* design_points; FT_Fixed* design_points;
FT_Fixed* blend_points; FT_Fixed* blend_points;
} T1_DesignMap; } PS_DesignMapRec, *PS_DesignMap;
/* backwards-compatible definition */
typedef PS_DesignMapRec T1_DesignMap;
typedef struct T1_Blend_ typedef struct PS_BlendRec_
{ {
FT_UInt num_designs; FT_UInt num_designs;
FT_UInt num_axis; FT_UInt num_axis;
FT_String* axis_names[T1_MAX_MM_AXIS]; FT_String* axis_names[T1_MAX_MM_AXIS];
FT_Fixed* design_pos[T1_MAX_MM_DESIGNS]; FT_Fixed* design_pos[T1_MAX_MM_DESIGNS];
T1_DesignMap design_map[T1_MAX_MM_AXIS]; PS_DesignMapRec design_map[T1_MAX_MM_AXIS];
FT_Fixed* weight_vector; FT_Fixed* weight_vector;
FT_Fixed* default_weight_vector; FT_Fixed* default_weight_vector;
T1_FontInfo* font_infos[T1_MAX_MM_DESIGNS + 1]; PS_FontInfo font_infos[T1_MAX_MM_DESIGNS + 1];
T1_Private* privates [T1_MAX_MM_DESIGNS + 1]; PS_Private privates [T1_MAX_MM_DESIGNS + 1];
FT_ULong blend_bitflags; FT_ULong blend_bitflags;
} T1_Blend; } PS_BlendRec, *PS_Blend;
typedef struct CID_FontDict_ /* backwards-compatible definition */
typedef PS_BlendRec T1_Blend;
typedef struct CID_FaceDictRec_
{ {
T1_Private private_dict; PS_PrivateRec private_dict;
FT_UInt len_buildchar; FT_UInt len_buildchar;
FT_Fixed forcebold_threshold; FT_Fixed forcebold_threshold;
@ -218,10 +269,14 @@ FT_BEGIN_HEADER
FT_ULong subrmap_offset; FT_ULong subrmap_offset;
FT_Int sd_bytes; FT_Int sd_bytes;
} CID_FontDict; } CID_FaceDictRec, *CID_FaceDict;
typedef struct CID_Info_ /* backwards-compatible definition */
typedef CID_FaceDictRec CID_FontDict;
typedef struct CID_FaceInfoRec_
{ {
FT_String* cid_font_name; FT_String* cid_font_name;
FT_Fixed cid_version; FT_Fixed cid_version;
@ -231,7 +286,7 @@ FT_BEGIN_HEADER
FT_String* ordering; FT_String* ordering;
FT_Int supplement; FT_Int supplement;
T1_FontInfo font_info; PS_FontInfoRec font_info;
FT_BBox font_bbox; FT_BBox font_bbox;
FT_ULong uid_base; FT_ULong uid_base;
@ -245,13 +300,25 @@ FT_BEGIN_HEADER
FT_ULong cid_count; FT_ULong cid_count;
FT_Int num_dicts; FT_Int num_dicts;
CID_FontDict* font_dicts; CID_FaceDict font_dicts;
FT_ULong data_offset; FT_ULong data_offset;
} CID_Info; } CID_FaceInfoRec, *CID_FaceInfo;
/*************************************************************************/
/* */
/* <Struct> */
/* CID_Info */
/* */
/* <Description> */
/* this type is equivalent to @CID_FaceInfoRec but has been deprecated */
/* it is kept to maintain source compatibility between various */
/* versions of FreeType */
/* */
typedef CID_FaceInfoRec CID_Info;
/* */ /* */

2
src/cff/cffgload.c
View File

@ -2225,7 +2225,7 @@
&charstring, &charstring_len ); &charstring, &charstring_len );
if ( !error ) if ( !error )
{ {
CFF_Index csindex = cff->charstrings_index; CFF_IndexRec csindex = cff->charstrings_index;
CFF_Prepare_Decoder( &decoder, glyph_index ); CFF_Prepare_Decoder( &decoder, glyph_index );

24
src/cff/cffload.c
View File

@ -1082,7 +1082,7 @@
static FT_Error static FT_Error
cff_new_index( CFF_Index* index, cff_new_index( CFF_Index index,
FT_Stream stream, FT_Stream stream,
FT_Bool load ) FT_Bool load )
{ {
@ -1155,7 +1155,7 @@
static void static void
cff_done_index( CFF_Index* index ) cff_done_index( CFF_Index index )
{ {
if ( index->stream ) if ( index->stream )
{ {
@ -1173,7 +1173,7 @@
static FT_Error static FT_Error
cff_explicit_index( CFF_Index* index, cff_explicit_index( CFF_Index index,
FT_Byte*** table ) FT_Byte*** table )
{ {
FT_Error error = 0; FT_Error error = 0;
@ -1205,7 +1205,7 @@
FT_LOCAL_DEF FT_Error FT_LOCAL_DEF FT_Error
CFF_Access_Element( CFF_Index* index, CFF_Access_Element( CFF_Index index,
FT_UInt element, FT_UInt element,
FT_Byte** pbytes, FT_Byte** pbytes,
FT_ULong* pbyte_len ) FT_ULong* pbyte_len )
@ -1270,7 +1270,7 @@
FT_LOCAL_DEF void FT_LOCAL_DEF void
CFF_Forget_Element( CFF_Index* index, CFF_Forget_Element( CFF_Index index,
FT_Byte** pbytes ) FT_Byte** pbytes )
{ {
if ( index->bytes == 0 ) if ( index->bytes == 0 )
@ -1284,7 +1284,7 @@
FT_LOCAL_DEF FT_String* FT_LOCAL_DEF FT_String*
CFF_Get_Name( CFF_Index* index, CFF_Get_Name( CFF_Index index,
FT_UInt element ) FT_UInt element )
{ {
FT_Memory memory = index->stream->memory; FT_Memory memory = index->stream->memory;
@ -1311,7 +1311,7 @@
FT_LOCAL_DEF FT_String* FT_LOCAL_DEF FT_String*
CFF_Get_String( CFF_Index* index, CFF_Get_String( CFF_Index index,
FT_UInt sid, FT_UInt sid,
PSNames_Service interface ) PSNames_Service interface )
{ {
@ -1484,7 +1484,7 @@
/*************************************************************************/ /*************************************************************************/
static void static void
CFF_Done_Encoding( CFF_Encoding* encoding, CFF_Done_Encoding( CFF_Encoding encoding,
FT_Stream stream ) FT_Stream stream )
{ {
FT_Memory memory = stream->memory; FT_Memory memory = stream->memory;
@ -1693,7 +1693,7 @@
static FT_Error static FT_Error
CFF_Load_Encoding( CFF_Encoding* encoding, CFF_Load_Encoding( CFF_Encoding encoding,
CFF_Charset* charset, CFF_Charset* charset,
FT_UInt num_glyphs, FT_UInt num_glyphs,
FT_Stream stream, FT_Stream stream,
@ -1958,7 +1958,7 @@
static FT_Error static FT_Error
CFF_Load_SubFont( CFF_SubFont* font, CFF_Load_SubFont( CFF_SubFont* font,
CFF_Index* index, CFF_Index index,
FT_UInt font_index, FT_UInt font_index,
FT_Stream stream, FT_Stream stream,
FT_ULong base_offset ) FT_ULong base_offset )
@ -1968,7 +1968,7 @@
FT_Byte* dict; FT_Byte* dict;
FT_ULong dict_len; FT_ULong dict_len;
CFF_Font_Dict* top = &font->font_dict; CFF_Font_Dict* top = &font->font_dict;
CFF_Private* priv = &font->private_dict; CFF_Private priv = &font->private_dict;
CFF_Parser_Init( &parser, CFF_CODE_TOPDICT, &font->font_dict ); CFF_Parser_Init( &parser, CFF_CODE_TOPDICT, &font->font_dict );
@ -2137,7 +2137,7 @@
/* now, check for a CID font */ /* now, check for a CID font */
if ( dict->cid_registry ) if ( dict->cid_registry )
{ {
CFF_Index fd_index; CFF_IndexRec fd_index;
CFF_SubFont* sub; CFF_SubFont* sub;
FT_UInt index; FT_UInt index;

8
src/cff/cffload.h
View File

@ -32,23 +32,23 @@ FT_BEGIN_HEADER
FT_LOCAL FT_String* FT_LOCAL FT_String*
CFF_Get_Name( CFF_Index* index, CFF_Get_Name( CFF_Index index,
FT_UInt element ); FT_UInt element );
FT_LOCAL FT_String* FT_LOCAL FT_String*
CFF_Get_String( CFF_Index* index, CFF_Get_String( CFF_Index index,
FT_UInt sid, FT_UInt sid,
PSNames_Service interface ); PSNames_Service interface );
FT_LOCAL FT_Error FT_LOCAL FT_Error
CFF_Access_Element( CFF_Index* index, CFF_Access_Element( CFF_Index index,
FT_UInt element, FT_UInt element,
FT_Byte** pbytes, FT_Byte** pbytes,
FT_ULong* pbyte_len ); FT_ULong* pbyte_len );
FT_LOCAL void FT_LOCAL void
CFF_Forget_Element( CFF_Index* index, CFF_Forget_Element( CFF_Index index,
FT_Byte** pbytes ); FT_Byte** pbytes );

4
src/cff/cffobjs.c
View File

@ -104,8 +104,8 @@
CFF_Font* font = face->extra.data; CFF_Font* font = face->extra.data;
CFF_SubFont* subfont = &font->top_font; CFF_SubFont* subfont = &font->top_font;
CFF_Private* cpriv = &subfont->private_dict; CFF_Private cpriv = &subfont->private_dict;
T1_Private priv; PS_PrivateRec priv;
/* IMPORTANT: The CFF and Type1 private dictionaries have */ /* IMPORTANT: The CFF and Type1 private dictionaries have */

2
src/cff/cfftoken.h
View File

@ -68,7 +68,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE CFF_Private #define FT_STRUCTURE CFF_PrivateRec
#undef CFFCODE #undef CFFCODE
#define CFFCODE CFFCODE_PRIVATE #define CFFCODE CFFCODE_PRIVATE

6
src/cid/cidgload.c
View File

@ -41,7 +41,7 @@
FT_UInt glyph_index ) FT_UInt glyph_index )
{ {
CID_Face face = (CID_Face)decoder->builder.face; CID_Face face = (CID_Face)decoder->builder.face;
CID_Info* cid = &face->cid; CID_FaceInfo cid = &face->cid;
FT_Byte* p; FT_Byte* p;
FT_UInt entry_len = cid->fd_bytes + cid->gd_bytes; FT_UInt entry_len = cid->fd_bytes + cid->gd_bytes;
FT_UInt fd_select; FT_UInt fd_select;
@ -68,8 +68,8 @@
/* the charstrings */ /* the charstrings */
if ( glyph_len > 0 ) if ( glyph_len > 0 )
{ {
CID_FontDict* dict; CID_FaceDict dict;
CID_Subrs* cid_subrs = face->subrs + fd_select; CID_Subrs cid_subrs = face->subrs + fd_select;
FT_Byte* charstring; FT_Byte* charstring;
FT_Memory memory = face->root.memory; FT_Memory memory = face->root.memory;

18
src/cid/cidload.c
View File

@ -96,7 +96,7 @@
CID_Parser* parser = &loader->parser; CID_Parser* parser = &loader->parser;
FT_Byte* object; FT_Byte* object;
void* dummy_object; void* dummy_object;
CID_Info* cid = &face->cid; CID_FaceInfo cid = &face->cid;
/* if the keyword has a dedicated callback, call it */ /* if the keyword has a dedicated callback, call it */
@ -120,7 +120,7 @@
default: default:
{ {
CID_FontDict* dict; CID_FaceDict dict;
if ( parser->num_dict < 0 ) if ( parser->num_dict < 0 )
@ -183,7 +183,7 @@
{ {
FT_Matrix* matrix; FT_Matrix* matrix;
FT_Vector* offset; FT_Vector* offset;
CID_FontDict* dict; CID_FaceDict dict;
FT_Face root = (FT_Face)&face->root; FT_Face root = (FT_Face)&face->root;
FT_Fixed temp[6]; FT_Fixed temp[6];
FT_Fixed temp_scale; FT_Fixed temp_scale;
@ -235,7 +235,7 @@
parse_fd_array( CID_Face face, parse_fd_array( CID_Face face,
CID_Parser* parser ) CID_Parser* parser )
{ {
CID_Info* cid = &face->cid; CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory; FT_Memory memory = face->root.memory;
FT_Error error = CID_Err_Ok; FT_Error error = CID_Err_Ok;
FT_Long num_dicts; FT_Long num_dicts;
@ -256,7 +256,7 @@
/* don't forget to set a few defaults */ /* don't forget to set a few defaults */
for ( n = 0; n < cid->num_dicts; n++ ) for ( n = 0; n < cid->num_dicts; n++ )
{ {
CID_FontDict* dict = cid->font_dicts + n; CID_FaceDict dict = cid->font_dicts + n;
/* default value for lenIV */ /* default value for lenIV */
@ -390,23 +390,23 @@
static FT_Error static FT_Error
cid_read_subrs( CID_Face face ) cid_read_subrs( CID_Face face )
{ {
CID_Info* cid = &face->cid; CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory; FT_Memory memory = face->root.memory;
FT_Stream stream = face->root.stream; FT_Stream stream = face->root.stream;
FT_Error error; FT_Error error;
FT_Int n; FT_Int n;
CID_Subrs* subr; CID_Subrs subr;
FT_UInt max_offsets = 0; FT_UInt max_offsets = 0;
FT_ULong* offsets = 0; FT_ULong* offsets = 0;
if ( ALLOC_ARRAY( face->subrs, cid->num_dicts, CID_Subrs ) ) if ( ALLOC_ARRAY( face->subrs, cid->num_dicts, CID_SubrsRec ) )
goto Exit; goto Exit;
subr = face->subrs; subr = face->subrs;
for ( n = 0; n < cid->num_dicts; n++, subr++ ) for ( n = 0; n < cid->num_dicts; n++, subr++ )
{ {
CID_FontDict* dict = cid->font_dicts + n; CID_FaceDict dict = cid->font_dicts + n;
FT_Int lenIV = dict->private_dict.lenIV; FT_Int lenIV = dict->private_dict.lenIV;
FT_UInt count, num_subrs = dict->num_subrs; FT_UInt count, num_subrs = dict->num_subrs;
FT_ULong data_len; FT_ULong data_len;

14
src/cid/cidobjs.c
View File

@ -133,8 +133,8 @@
{ {
PSH_Globals globals; PSH_Globals globals;
CID_Face face = (CID_Face)size->root.face; CID_Face face = (CID_Face)size->root.face;
CID_FontDict* dict = face->cid.font_dicts + face->root.face_index; CID_FaceDict dict = face->cid.font_dicts + face->root.face_index;
T1_Private* priv = &dict->private_dict; PS_Private priv = &dict->private_dict;
error = funcs->create( size->root.face->memory, priv, &globals ); error = funcs->create( size->root.face->memory, priv, &globals );
@ -190,8 +190,8 @@
if ( face ) if ( face )
{ {
CID_Info* cid = &face->cid; CID_FaceInfo cid = &face->cid;
T1_FontInfo* info = &cid->font_info; PS_FontInfo info = &cid->font_info;
memory = face->root.memory; memory = face->root.memory;
@ -204,7 +204,7 @@
for ( n = 0; n < cid->num_dicts; n++ ) for ( n = 0; n < cid->num_dicts; n++ )
{ {
CID_Subrs* subr = face->subrs + n; CID_Subrs subr = face->subrs + n;
if ( subr->code ) if ( subr->code )
@ -468,12 +468,12 @@
switch ( face->type1.encoding_type ) switch ( face->type1.encoding_type )
{ {
case t1_encoding_standard: case T1_ENCODING_TYPE_STANDARD:
charmap->encoding = ft_encoding_adobe_standard; charmap->encoding = ft_encoding_adobe_standard;
charmap->encoding_id = 0; charmap->encoding_id = 0;
break; break;
case t1_encoding_expert: case T1_ENCODING_TYPE_EXPORT:
charmap->encoding = ft_encoding_adobe_expert; charmap->encoding = ft_encoding_adobe_expert;
charmap->encoding_id = 1; charmap->encoding_id = 1;
break; break;

2
src/cid/cidparse.h
View File

@ -65,7 +65,7 @@ FT_BEGIN_HEADER
FT_ULong data_offset; FT_ULong data_offset;
CID_Info* cid; CID_FaceInfo cid;
FT_Int num_dict; FT_Int num_dict;
} CID_Parser; } CID_Parser;

4
src/cid/cidriver.c
View File

@ -136,7 +136,7 @@
/* */ /* */
case ft_encoding_adobe_custom: case ft_encoding_adobe_custom:
{ {
T1_Encoding* encoding = &face->type1.encoding; T1_Encoding encoding = &face->type1.encoding;
if ( charcode >= encoding->code_first && if ( charcode >= encoding->code_first &&
@ -230,7 +230,7 @@
/* */ /* */
case ft_encoding_adobe_custom: case ft_encoding_adobe_custom:
{ {
T1_Encoding* encoding = &face->type1.encoding; T1_Encoding encoding = &face->type1.encoding;
charcode++; charcode++;

8
src/cid/cidtoken.h
View File

@ -17,7 +17,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE CID_Info #define FT_STRUCTURE CID_FaceInfoRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_cid_info #define T1CODE t1_field_cid_info
@ -35,7 +35,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontInfo #define FT_STRUCTURE PS_FontInfoRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_font_info #define T1CODE t1_field_font_info
@ -51,7 +51,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE CID_FontDict #define FT_STRUCTURE CID_FaceDictRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_font_dict #define T1CODE t1_field_font_dict
@ -67,7 +67,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_Private #define FT_STRUCTURE PS_PrivateRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_private #define T1CODE t1_field_private

3
src/otlayout/otlcommn.h
View File

@ -168,7 +168,8 @@ OTL_BEGIN_HEADER
OTL_LOCALDEF( OTL_UInt ) OTL_LOCALDEF( OTL_UInt )
otl_feature_get_count( OTL_Bytes table ); otl_feature_get_count( OTL_Bytes table );
/* get several lookups from a feature. returns the number of lookups grabbed */ /* get several lookups indices from a feature. returns the number of lookups */
/* grabbed */
OTL_LOCALDEF( OTL_UInt ) OTL_LOCALDEF( OTL_UInt )
otl_feature_get_lookups( OTL_Bytes table, otl_feature_get_lookups( OTL_Bytes table,
OTL_UInt start, OTL_UInt start,

4
src/psaux/t1decode.c
View File

@ -656,7 +656,7 @@
case 17: case 17:
case 18: /* multiple masters */ case 18: /* multiple masters */
{ {
T1_Blend* blend = decoder->blend; PS_Blend blend = decoder->blend;
FT_UInt num_points, nn, mm; FT_UInt num_points, nn, mm;
FT_Long* delta; FT_Long* delta;
FT_Long* values; FT_Long* values;
@ -1112,7 +1112,7 @@
FT_Size size, FT_Size size,
FT_GlyphSlot slot, FT_GlyphSlot slot,
FT_Byte** glyph_names, FT_Byte** glyph_names,
T1_Blend* blend, PS_Blend blend,
FT_Bool hinting, FT_Bool hinting,
T1_Decoder_Callback parse_callback ) T1_Decoder_Callback parse_callback )
{ {

2
src/psaux/t1decode.h
View File

@ -48,7 +48,7 @@ FT_BEGIN_HEADER
FT_Size size, FT_Size size,
FT_GlyphSlot slot, FT_GlyphSlot slot,
FT_Byte** glyph_names, FT_Byte** glyph_names,
T1_Blend* blend, PS_Blend blend,
FT_Bool hinting, FT_Bool hinting,
T1_Decoder_Callback parse_glyph ); T1_Decoder_Callback parse_glyph );

4
src/type1/t1afm.c
View File

@ -57,7 +57,7 @@
static FT_UInt static FT_UInt
afm_atoindex( FT_Byte** start, afm_atoindex( FT_Byte** start,
FT_Byte* limit, FT_Byte* limit,
T1_Font* type1 ) T1_Font type1 )
{ {
FT_Byte* p = *start; FT_Byte* p = *start;
FT_Int len; FT_Int len;
@ -167,7 +167,7 @@
FT_Byte* p; FT_Byte* p;
FT_Int count = 0; FT_Int count = 0;
T1_Kern_Pair* pair; T1_Kern_Pair* pair;
T1_Font* type1 = &((T1_Face)t1_face)->type1; T1_Font type1 = &((T1_Face)t1_face)->type1;
T1_AFM* afm = 0; T1_AFM* afm = 0;

2
src/type1/t1cmap.c
View File

@ -155,7 +155,7 @@
t1_cmap_custom_init( T1_CMapCustom cmap ) t1_cmap_custom_init( T1_CMapCustom cmap )
{ {
T1_Face face = (T1_Face) FT_CMAP_FACE(cmap); T1_Face face = (T1_Face) FT_CMAP_FACE(cmap);
T1_Encoding* encoding = face->type1.encoding; T1_Encoding encoding = face->type1.encoding;
cmap->first = encoding->code_first; cmap->first = encoding->code_first;
cmap->count = (FT_UInt)(encoding->code_last - cmap->first + 1); cmap->count = (FT_UInt)(encoding->code_last - cmap->first + 1);

4
src/type1/t1driver.c
View File

@ -297,7 +297,7 @@
/* */ /* */
case ft_encoding_adobe_custom: case ft_encoding_adobe_custom:
{ {
T1_Encoding* encoding = &face->type1.encoding; T1_Encoding encoding = &face->type1.encoding;
if ( charcode >= encoding->code_first && if ( charcode >= encoding->code_first &&
@ -406,7 +406,7 @@
/* */ /* */
case ft_encoding_adobe_custom: case ft_encoding_adobe_custom:
{ {
T1_Encoding* encoding = &face->type1.encoding; T1_Encoding encoding = &face->type1.encoding;
charcode++; charcode++;

6
src/type1/t1gload.c
View File

@ -60,7 +60,7 @@
FT_UInt glyph_index ) FT_UInt glyph_index )
{ {
T1_Face face = (T1_Face)decoder->builder.face; T1_Face face = (T1_Face)decoder->builder.face;
T1_Font* type1 = &face->type1; T1_Font type1 = &face->type1;
decoder->font_matrix = type1->font_matrix; decoder->font_matrix = type1->font_matrix;
@ -80,7 +80,7 @@
FT_Error error; FT_Error error;
T1_DecoderRec decoder; T1_DecoderRec decoder;
FT_Int glyph_index; FT_Int glyph_index;
T1_Font* type1 = &face->type1; T1_Font type1 = &face->type1;
PSAux_Service psaux = (PSAux_Service)face->psaux; PSAux_Service psaux = (PSAux_Service)face->psaux;
@ -146,7 +146,7 @@
T1_DecoderRec decoder; T1_DecoderRec decoder;
T1_Face face = (T1_Face)glyph->root.face; T1_Face face = (T1_Face)glyph->root.face;
FT_Bool hinting; FT_Bool hinting;
T1_Font* type1 = &face->type1; T1_Font type1 = &face->type1;
PSAux_Service psaux = (PSAux_Service)face->psaux; PSAux_Service psaux = (PSAux_Service)face->psaux;
const T1_Decoder_Funcs decoder_funcs = psaux->t1_decoder_funcs; const T1_Decoder_Funcs decoder_funcs = psaux->t1_decoder_funcs;

46
src/type1/t1load.c
View File

@ -101,7 +101,7 @@
FT_UInt num_designs, FT_UInt num_designs,
FT_UInt num_axis ) FT_UInt num_axis )
{ {
T1_Blend* blend; PS_Blend blend;
FT_Memory memory = face->root.memory; FT_Memory memory = face->root.memory;
FT_Error error = 0; FT_Error error = 0;
@ -124,8 +124,8 @@
/* allocate the blend `private' and `font_info' dictionaries */ /* allocate the blend `private' and `font_info' dictionaries */
if ( ALLOC_ARRAY( blend->font_infos[1], num_designs, T1_FontInfo ) || if ( ALLOC_ARRAY( blend->font_infos[1], num_designs, PS_FontInfoRec ) ||
ALLOC_ARRAY( blend->privates[1], num_designs, T1_Private ) || ALLOC_ARRAY( blend->privates[1], num_designs, PS_PrivateRec ) ||
ALLOC_ARRAY( blend->weight_vector, num_designs * 2, FT_Fixed ) ) ALLOC_ARRAY( blend->weight_vector, num_designs * 2, FT_Fixed ) )
goto Exit; goto Exit;
@ -184,7 +184,7 @@
T1_Get_Multi_Master( T1_Face face, T1_Get_Multi_Master( T1_Face face,
FT_Multi_Master* master ) FT_Multi_Master* master )
{ {
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
FT_UInt n; FT_UInt n;
FT_Error error; FT_Error error;
@ -199,7 +199,7 @@
for ( n = 0; n < blend->num_axis; n++ ) for ( n = 0; n < blend->num_axis; n++ )
{ {
FT_MM_Axis* axis = master->axis + n; FT_MM_Axis* axis = master->axis + n;
T1_DesignMap* map = blend->design_map + n; PS_DesignMap map = blend->design_map + n;
axis->name = blend->axis_names[n]; axis->name = blend->axis_names[n];
@ -217,7 +217,7 @@
FT_UInt num_coords, FT_UInt num_coords,
FT_Fixed* coords ) FT_Fixed* coords )
{ {
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
FT_Error error; FT_Error error;
FT_UInt n, m; FT_UInt n, m;
@ -263,7 +263,7 @@
FT_UInt num_coords, FT_UInt num_coords,
FT_Long* coords ) FT_Long* coords )
{ {
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
FT_Error error; FT_Error error;
FT_UInt n, p; FT_UInt n, p;
@ -279,7 +279,7 @@
{ {
FT_Long design = coords[n]; FT_Long design = coords[n];
FT_Fixed the_blend; FT_Fixed the_blend;
T1_DesignMap* map = blend->design_map + n; PS_DesignMap map = blend->design_map + n;
FT_Fixed* designs = map->design_points; FT_Fixed* designs = map->design_points;
FT_Fixed* blends = map->blend_points; FT_Fixed* blends = map->blend_points;
FT_Int before = -1, after = -1; FT_Int before = -1, after = -1;
@ -332,7 +332,7 @@
T1_Done_Blend( T1_Face face ) T1_Done_Blend( T1_Face face )
{ {
FT_Memory memory = face->root.memory; FT_Memory memory = face->root.memory;
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
if ( blend ) if ( blend )
@ -368,7 +368,7 @@
/* release design map */ /* release design map */
for ( n = 0; n < num_axis; n++ ) for ( n = 0; n < num_axis; n++ )
{ {
T1_DesignMap* dmap = blend->design_map + n; PS_DesignMap dmap = blend->design_map + n;
FREE( dmap->design_points ); FREE( dmap->design_points );
@ -387,7 +387,7 @@
T1_TokenRec axis_tokens[ T1_MAX_MM_AXIS ]; T1_TokenRec axis_tokens[ T1_MAX_MM_AXIS ];
FT_Int n, num_axis; FT_Int n, num_axis;
FT_Error error = 0; FT_Error error = 0;
T1_Blend* blend; PS_Blend blend;
FT_Memory memory; FT_Memory memory;
@ -451,7 +451,7 @@
T1_Parser parser = &loader->parser; T1_Parser parser = &loader->parser;
FT_Error error = 0; FT_Error error = 0;
T1_Blend* blend; PS_Blend blend;
/* get the array of design tokens - compute number of designs */ /* get the array of design tokens - compute number of designs */
@ -529,7 +529,7 @@
{ {
FT_Error error = 0; FT_Error error = 0;
T1_Parser parser = &loader->parser; T1_Parser parser = &loader->parser;
T1_Blend* blend; PS_Blend blend;
T1_TokenRec axis_tokens[ T1_MAX_MM_AXIS ]; T1_TokenRec axis_tokens[ T1_MAX_MM_AXIS ];
FT_Int n, num_axis; FT_Int n, num_axis;
FT_Byte* old_cursor; FT_Byte* old_cursor;
@ -556,7 +556,7 @@
/* now, read each axis design map */ /* now, read each axis design map */
for ( n = 0; n < num_axis; n++ ) for ( n = 0; n < num_axis; n++ )
{ {
T1_DesignMap* map = blend->design_map + n; PS_DesignMap map = blend->design_map + n;
T1_Token token; T1_Token token;
FT_Int p, num_points; FT_Int p, num_points;
@ -610,7 +610,7 @@
{ {
FT_Error error = 0; FT_Error error = 0;
T1_Parser parser = &loader->parser; T1_Parser parser = &loader->parser;
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
T1_TokenRec master; T1_TokenRec master;
FT_UInt n; FT_UInt n;
FT_Byte* old_cursor; FT_Byte* old_cursor;
@ -698,7 +698,7 @@
void* dummy_object; void* dummy_object;
void** objects; void** objects;
FT_UInt max_objects; FT_UInt max_objects;
T1_Blend* blend = face->blend; PS_Blend blend = face->blend;
/* if the keyword has a dedicated callback, call it */ /* if the keyword has a dedicated callback, call it */
@ -954,7 +954,7 @@
/* and we must load it now */ /* and we must load it now */
if ( (FT_Byte)( *cur - '0' ) < 10 ) if ( (FT_Byte)( *cur - '0' ) < 10 )
{ {
T1_Encoding* encode = &face->type1.encoding; T1_Encoding encode = &face->type1.encoding;
FT_Int count, n; FT_Int count, n;
PS_Table char_table = &loader->encoding_table; PS_Table char_table = &loader->encoding_table;
FT_Memory memory = parser->root.memory; FT_Memory memory = parser->root.memory;
@ -1067,7 +1067,7 @@
cur++; cur++;
} }
face->type1.encoding_type = t1_encoding_array; face->type1.encoding_type = T1_ENCODING_TYPE_ARRAY;
parser->root.cursor = cur; parser->root.cursor = cur;
} }
/* Otherwise, we should have either `StandardEncoding' or */ /* Otherwise, we should have either `StandardEncoding' or */
@ -1076,15 +1076,15 @@
{ {
if ( cur + 17 < limit && if ( cur + 17 < limit &&
strncmp( (const char*)cur, "StandardEncoding", 16 ) == 0 ) strncmp( (const char*)cur, "StandardEncoding", 16 ) == 0 )
face->type1.encoding_type = t1_encoding_standard; face->type1.encoding_type = T1_ENCODING_TYPE_STANDARD;
else if ( cur + 15 < limit && else if ( cur + 15 < limit &&
strncmp( (const char*)cur, "ExpertEncoding", 14 ) == 0 ) strncmp( (const char*)cur, "ExpertEncoding", 14 ) == 0 )
face->type1.encoding_type = t1_encoding_expert; face->type1.encoding_type = T1_ENCODING_TYPE_EXPORT;
else if ( cur + 18 < limit && else if ( cur + 18 < limit &&
strncmp( (const char*)cur, "ISOLatin1Encoding", 17 ) == 0 ) strncmp( (const char*)cur, "ISOLatin1Encoding", 17 ) == 0 )
face->type1.encoding_type = t1_encoding_isolatin1; face->type1.encoding_type = T1_ENCODING_TYPE_ISOLATIN1;
else else
{ {
@ -1642,7 +1642,7 @@
{ {
T1_Loader loader; T1_Loader loader;
T1_Parser parser; T1_Parser parser;
T1_Font* type1 = &face->type1; T1_Font type1 = &face->type1;
FT_Error error; FT_Error error;
PSAux_Service psaux = (PSAux_Service)face->psaux; PSAux_Service psaux = (PSAux_Service)face->psaux;
@ -1707,7 +1707,7 @@
/* we must now build type1.encoding when we have a custom */ /* we must now build type1.encoding when we have a custom */
/* array.. */ /* array.. */
if ( type1->encoding_type == t1_encoding_array ) if ( type1->encoding_type == T1_ENCODING_TYPE_ARRAY )
{ {
FT_Int charcode, index, min_char, max_char; FT_Int charcode, index, min_char, max_char;
FT_Byte* char_name; FT_Byte* char_name;

12
src/type1/t1objs.c
View File

@ -187,7 +187,7 @@
T1_Face_Done( T1_Face face ) T1_Face_Done( T1_Face face )
{ {
FT_Memory memory; FT_Memory memory;
T1_Font* type1 = &face->type1; T1_Font type1 = &face->type1;
if ( face ) if ( face )
@ -202,7 +202,7 @@
/* release font info strings */ /* release font info strings */
{ {
T1_FontInfo* info = &type1->font_info; PS_FontInfo info = &type1->font_info;
FREE( info->version ); FREE( info->version );
@ -479,22 +479,22 @@
switch ( face->type1.encoding_type ) switch ( face->type1.encoding_type )
{ {
case t1_encoding_standard: case T1_ENCODING_TYPE_STANDARD:
charmap->encoding = ft_encoding_adobe_standard; charmap->encoding = ft_encoding_adobe_standard;
charmap->encoding_id = 0; charmap->encoding_id = 0;
break; break;
case t1_encoding_expert: case T1_ENCODING_TYPE_EXPORT:
charmap->encoding = ft_encoding_adobe_expert; charmap->encoding = ft_encoding_adobe_expert;
charmap->encoding_id = 1; charmap->encoding_id = 1;
break; break;
case t1_encoding_array: case T1_ENCODING_TYPE_ARRAY:
charmap->encoding = ft_encoding_adobe_custom; charmap->encoding = ft_encoding_adobe_custom;
charmap->encoding_id = 2; charmap->encoding_id = 2;
break; break;
case t1_encoding_isolatin1: case T1_ENCODING_TYPE_ISOLATIN1:
charmap->encoding = ft_encoding_latin_1; charmap->encoding = ft_encoding_latin_1;
charmap->encoding_id = 3; charmap->encoding_id = 3;
break; break;

6
src/type1/t1tokens.h
View File

@ -17,7 +17,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontInfo #define FT_STRUCTURE PS_FontInfoRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_font_info #define T1CODE t1_field_font_info
@ -34,7 +34,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_Private #define FT_STRUCTURE PS_PrivateRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_private #define T1CODE t1_field_private
@ -61,7 +61,7 @@
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_Font #define FT_STRUCTURE T1_FontRec
#undef T1CODE #undef T1CODE
#define T1CODE t1_field_font_dict #define T1CODE t1_field_font_dict