Index: include/freetype/internal/t1types.h
===================================================================
RCS file: /cvs/freetype/freetype2/include/freetype/internal/t1types.h,v
retrieving revision 1.30
diff -r1.30 t1types.h
122a123,152
>   typedef struct  T42_FontRec_
>   {
>    /* font info dictionary */
>     PS_FontInfoRec   font_info;
> 
>    /* top-level dictionary */
>     FT_String*       font_name;
> 
>     T1_EncodingType  encoding_type;
>     T1_EncodingRec   encoding;
> 
>     FT_Byte*         charstrings_block;
>     FT_Byte*         glyph_names_block;
> 
>     FT_Int           num_glyphs;
>     FT_String**      glyph_names;       /* array of glyph names       */
>     FT_Byte**        charstrings;       /* array of glyph charstrings */
>     FT_Int*          charstrings_len;
> 
>     FT_Byte          paint_type;
>     FT_Byte          font_type;
>     FT_Matrix        font_matrix; /* From FontMatrix field: a, b, c, d */
>     FT_Vector        font_offset; /* From FontMatrix field: tx, ty */
>     FT_BBox          font_bbox;
> 
>     FT_Int           stroke_width;
> 
>    } T42_FontRec, *T42_Font;
> 
> 
155a186
>   typedef struct T42_FaceRec_*  T42_Face;
176a208,224
> 
> 
>   typedef struct  T42_FaceRec_
>   {
>     FT_FaceRec     root;
>     T42_FontRec    type42;
>     const void*    psnames;
>     const void*    psaux;
>     const void*    afm_data;
>     FT_Byte*       ttf_data;
>     FT_ULong       ttf_size;
>     FT_Face        ttf_face;
>     FT_CharMapRec  charmaprecs[2];
>     FT_CharMap     charmaps[2];
>     PS_Unicodes    unicode_map;
> 
>   } T42_FaceRec;
Index: src/type42/t42drivr.c
===================================================================
RCS file: /cvs/freetype/freetype2/src/type42/t42drivr.c,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 t42drivr.c
41,97d40
<   typedef enum  T42_EncodingType_
<   {
<     T42_ENCODING_TYPE_NONE = 0,
<     T42_ENCODING_TYPE_ARRAY,
<     T42_ENCODING_TYPE_STANDARD,
<     T42_ENCODING_TYPE_EXPERT,
<     T42_ENCODING_TYPE_ISOLATIN1
<   
<   } T42_EncodingType;
< 
< 
<   typedef struct  T42_Font_ 
<   {
<     /* font info dictionary */
<     PS_FontInfoRec   font_info; 
< 
<     /* top-level dictionary */
<     FT_String*        font_name;
< 
<     T42_EncodingType  encoding_type; 
<     T1_EncodingRec    encoding;
< 
<     FT_Byte*          charstrings_block;
<     FT_Byte*          glyph_names_block;
< 
<     FT_Int            num_glyphs;
<     FT_String**       glyph_names;       /* array of glyph names       */
<     FT_Byte**         charstrings;       /* array of glyph charstrings */
<     FT_Int*           charstrings_len;
< 
<     FT_Byte           paint_type;
<     FT_Byte           font_type;
<     FT_Matrix         font_matrix; /* From FontMatrix field: a, b, c, d */
<     FT_Vector         font_offset; /* From FontMatrix field: tx, ty */
<     FT_BBox           font_bbox;
< 
<     FT_Int            stroke_width;  
< 
<   } T42_FontRec, *T42_Font;
< 
< 
<   typedef struct  T42_FaceRec_
<   {
<     FT_FaceRec     root;
<     T42_FontRec    type42;
<     void*          psnames;
<     void*          psaux;
<     void*          afm_data;
<     FT_Byte*       ttf_data;
<     FT_ULong       ttf_size;
<     FT_Face        ttf_face;
<     FT_CharMapRec  charmaprecs[2];
<     FT_CharMap     charmaps[2];
<     PS_Unicodes    unicode_map;
< 
<   } T42_FaceRec, *T42_Face;
< 
434,437d376
<     /* XXX: Are these three lines necessary */
<     if ( matrix->xx || matrix->yx )
<       /* with synthetic fonts, it's possible we get here twice  */
<       return;
607c546
<       face->type42.encoding_type = T42_ENCODING_TYPE_ARRAY;
---
>       face->type42.encoding_type = T1_ENCODING_TYPE_ARRAY;
616c555
<         face->type42.encoding_type = T42_ENCODING_TYPE_STANDARD;
---
>         face->type42.encoding_type = T1_ENCODING_TYPE_STANDARD;
620c559
<         face->type42.encoding_type = T42_ENCODING_TYPE_EXPERT;
---
>         face->type42.encoding_type = T1_ENCODING_TYPE_EXPERT;
624c563
<         face->type42.encoding_type = T42_ENCODING_TYPE_ISOLATIN1;
---
>         face->type42.encoding_type = T1_ENCODING_TYPE_ISOLATIN1;
657,658c596,597
<     FT_Int      num_tables, status;
<     FT_ULong    count, ttf_size, string_size;
---
>     FT_Int      num_tables = 0, status;
>     FT_ULong    count, ttf_size = 0, string_size = 0;
660c599
<     FT_Byte     v;
---
>     FT_Byte     v = 0;
1154c1093
<     if ( type42->encoding_type == T42_ENCODING_TYPE_ARRAY )
---
>     if ( type42->encoding_type == T1_ENCODING_TYPE_ARRAY )
1419c1358
<     case T42_ENCODING_TYPE_STANDARD:
---
>     case T1_ENCODING_TYPE_STANDARD:
1424c1363
<     case T42_ENCODING_TYPE_EXPERT:
---
>     case T1_ENCODING_TYPE_EXPERT:
1429c1368
<     case T42_ENCODING_TYPE_ARRAY:
---
>     case T1_ENCODING_TYPE_ARRAY:
1434c1373
<     case T42_ENCODING_TYPE_ISOLATIN1:
---
>     case T1_ENCODING_TYPE_ISOLATIN1:
1543,1548d1481
<     /* XXX: What about hinter support? */
< #if 0
<     if (ttmodule->clazz->module_flags & ft_module_driver_has_hinter)
<       driver->root.clazz->root.module_flags |= ft_module_driver_has_hinter;
< #endif
< 
2065a1999
> #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
2066a2001,2003
> #else
>       0,
> #endif