minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* 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.
This commit is contained in:
Werner Lemberg 2002-06-19 19:43:15 +00:00
parent d594a7012b
commit 5d52c90501
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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,

21
src/type42/t42drivr.c
View File

@ -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"

18
src/type42/t42objs.c
View File

@ -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,