Commit 0657a8ac949d0e33deb64b31252f247b9e00235c
2002-06-19T19:43:15
* src/type42/t42objs.c (t42_check_size_change): Removed. (T42_Size_SetChars, T42_Size_SetPixels): Use FT_Activate_Size instead. (T42_GlyphSlot_Load): Remove call to t42_check_size_change.
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
diff --git a/ChangeLog b/ChangeLog
index 9443aaf..a38ed20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-18 Roberto Alameda <ojancano@geekmail.de>.
+
+ * src/type42/t42objs.c (t42_check_size_change): Removed.
+ (T42_Size_SetChars, T42_Size_SetPixels): Use FT_Activate_Size
+ instead.
+ (T42_GlyphSlot_Load): Remove call to t42_check_size_change.
+
2002-06-18 Detlef Würkner <TetiSoft@apg.lahn.de>
* src/psaux/t1cmap.c (t1_cmap_custom_char_index,
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index 3e01498..a053318 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -15,6 +15,27 @@
/***************************************************************************/
+ /*************************************************************************/
+ /* */
+ /* This driver implements Type42 fonts as described in the */
+ /* Technical Note #5012 from Adobe, with these limitations: */
+ /* */
+ /* 1) CID Fonts are not currently supported. */
+ /* 2) Incremental fonts making use of the GlyphDirectory keyword */
+ /* will be loaded, but the rendering will be using the TrueType */
+ /* tables. */
+ /* 3) The sfnts array is expected to be ASCII, not binary. */
+ /* 4) As for Type1 fonts, CDevProc is not supported. */
+ /* 5) The Metrics dictionary is not supported. */
+ /* 6) AFM metrics are not supported. */
+ /* */
+ /* In other words, this driver supports Type42 fonts derived from */
+ /* TrueType fonts in a non-CID manner, as done by usual conversion */
+ /* programs. */
+ /* */
+ /*************************************************************************/
+
+
#include "t42drivr.h"
#include "t42objs.h"
#include "t42error.h"
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index da2e7e6..7e90cfc 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -705,17 +705,6 @@
}
- static void
- t42_check_size_change( FT_Face face )
- {
- FT_Face tt_face = ((T42_Face)face)->ttf_face;
- FT_Size tt_size = ((T42_Size)face->size)->ttsize;
-
-
- if ( tt_face->size != tt_size )
- FT_Activate_Size( tt_size );
- }
-
FT_LOCAL_DEF( FT_Error )
T42_Size_SetChars( T42_Size size,
@@ -728,7 +717,7 @@
T42_Face t42face = (T42_Face)face;
- t42_check_size_change( t42face->ttf_face );
+ FT_Activate_Size(size->ttsize);
return FT_Set_Char_Size( t42face->ttf_face,
char_width,
@@ -747,7 +736,7 @@
T42_Face t42face = (T42_Face)face;
- t42_check_size_change( t42face->ttf_face );
+ FT_Activate_Size(size->ttsize);
return FT_Set_Pixel_Sizes( t42face->ttf_face,
pixel_width,
@@ -796,12 +785,9 @@
FT_Error error;
T42_GlyphSlot t42slot = (T42_GlyphSlot)glyph;
T42_Size t42size = (T42_Size)size;
- FT_Face tt_face = ((T42_Face) glyph->face)->ttf_face;
FT_Driver_Class ttclazz = ((T42_Driver)glyph->face->driver)->ttclazz;
- t42_check_size_change( tt_face );
-
ft_glyphslot_clear( t42slot->ttslot );
error = ttclazz->load_glyph( t42slot->ttslot,
t42size->ttsize,