diff options
| author | Werner Lemberg <wl@gnu.org> | 2002-06-19 19:43:15 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2002-06-19 19:43:15 +0000 |
| commit | 0657a8ac949d0e33deb64b31252f247b9e00235c (patch) | |
| tree | a2c7df80e1964507186eb221861e1753a7146e54 | |
| parent | 0bb4a0f93a8a241a3e499f62292b730fb340c339 (diff) | |
| download | freetype2-0657a8ac949d0e33deb64b31252f247b9e00235c.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/type42/t42drivr.c | 21 | ||||
| -rw-r--r-- | src/type42/t42objs.c | 18 |
3 files changed, 30 insertions, 16 deletions
@@ -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 3e0149876..a05331851 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 da2e7e6a3..7e90cfc50 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, |