* include/freetype/internal/t42types.h, src/base/fttype1.c, src/type42/t42objs.h: removed duplicate definition of T42_FaceRec
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
diff --git a/ChangeLog b/ChangeLog
index fea5db0..0070c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-22 Roberto Alameda <ojancano@geekmail.de>.
+
+ * include/freetype/internal/t42types.h, src/base/fttype1.c,
+ src/type42/t42objs.h: removed duplicate definition of T42_FaceRec
+
2002-06-22 Detlef Würkner <TetiSoft@apg.lahn.de>
* src/pfr/pfrgload.c (pfr_glyph_load_compound): fixing a small composite
diff --git a/include/freetype/internal/t42types.h b/include/freetype/internal/t42types.h
index aa728bf..4675331 100644
--- a/include/freetype/internal/t42types.h
+++ b/include/freetype/internal/t42types.h
@@ -29,41 +29,10 @@
FT_BEGIN_HEADER
-
- 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;
-
-
typedef struct T42_FaceRec_
{
FT_FaceRec root;
- T42_FontRec type42;
+ T1_FontRec type1;
const void* psnames;
const void* psaux;
const void* afm_data;
diff --git a/src/base/fttype1.c b/src/base/fttype1.c
index 3a84be7..91dda27 100644
--- a/src/base/fttype1.c
+++ b/src/base/fttype1.c
@@ -41,7 +41,7 @@
else if ( ft_strcmp( driver_name, "t1cid" ) == 0 )
font_info = &((CID_Face)face)->cid.font_info;
else if ( ft_strcmp( driver_name, "type42" ) == 0 )
- font_info = &((T42_Face)face)->type42.font_info;
+ font_info = &((T42_Face)face)->type1.font_info;
}
if ( font_info != NULL )
{
@@ -66,8 +66,8 @@
if ( face && face->driver && face->driver->root.clazz )
{
- /* Currently, only the type1 and cff drivers provide reliable */
- /* glyph names... */
+ /* Currently, only the type1, type42 and cff drivers provide reliable */
+ /* glyph names... */
/* We could probably hack the TrueType driver to recognize */
/* certain cases where the glyph names are most certainly */
@@ -75,8 +75,9 @@
/* this will probably happen later... */
driver_name = face->driver->root.clazz->module_name;
- result = ( ft_strcmp( driver_name, "type1" ) == 0 ||
- ft_strcmp( driver_name, "cff" ) == 0 );
+ result = ( ft_strcmp( driver_name, "type1" ) == 0 ||
+ ft_strcmp( driver_name, "type42" ) == 0 ||
+ ft_strcmp( driver_name, "cff" ) == 0 );
}
return result;
diff --git a/src/type42/t42objs.h b/src/type42/t42objs.h
index 717b107..ae00a33 100644
--- a/src/type42/t42objs.h
+++ b/src/type42/t42objs.h
@@ -22,6 +22,7 @@
#include FT_FREETYPE_H
#include FT_TYPE1_TABLES_H
#include FT_INTERNAL_TYPE1_TYPES_H
+#include FT_INTERNAL_TYPE42_TYPES_H
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_DRIVER_H
#include FT_INTERNAL_POSTSCRIPT_NAMES_H
@@ -30,26 +31,6 @@
FT_BEGIN_HEADER
- /* Type42 face */
- typedef struct T42_FaceRec_
- {
- FT_FaceRec root;
- T1_FontRec type1;
- const void* psnames;
- const void* psaux;
- const void* afm_data;
-
- FT_CharMapRec charmaprecs[2];
- FT_CharMap charmaps[2];
- PS_Unicodes unicode_map;
-
- FT_Byte* ttf_data;
- FT_ULong ttf_size;
- FT_Face ttf_face;
-
- } T42_FaceRec, *T42_Face;
-
-
/* Type42 size */
typedef struct T42_SizeRec_
{