diff options
-rw-r--r-- | ChangeLog | 20 | ||||
-rw-r--r-- | src/base/ftobjs.c | 2 | ||||
-rw-r--r-- | src/cff/cffdrivr.c | 2 | ||||
-rw-r--r-- | src/cff/cffobjs.c | 10 | ||||
-rw-r--r-- | src/cid/cidobjs.c | 7 | ||||
-rw-r--r-- | src/pshinter/pshglob.h | 15 | ||||
-rw-r--r-- | src/pshinter/pshmod.c | 4 | ||||
-rw-r--r-- | src/type1/t1objs.c | 12 |
8 files changed, 45 insertions, 27 deletions
@@ -1,3 +1,23 @@ +2002-03-08 Werner Lemberg <wl@gnu.org> + + * src/base/ftobjs.c (FT_Realloc): Use MEM_Set instead of memset. + +2002-03-07 Werner Lemberg <wl@gnu.org> + + * src/cff/cffdrivr.c (cff_get_name_index): Fix compiler warnings. + * src/cff/cffobjs CFF_Size_Get_Globals_Funcs, CFF_Size_Init, + CFF_GlyphSlot_Init): Ditto. + * src/cid/cidobjs.c (CID_GlyphSlot_Init, CID_Size_Get_Globals_Funcs): + Ditto. + * src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init): + Ditto. + + * src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ... + (PSH_BLUE_ALIGN_{TOP,BOT}): New defines. + (PSH_AlignmentRec): Updated. + + * src/pshinter/pshmod.c (pshinter_interface): Use `static const'. + 2002-03-06 David Turner <david@freetype.org> * docs/CHANGES: update to indicate the new FT_Library_Version API diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 9e2b613d9..e0ffe2412 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -112,7 +112,7 @@ goto Fail; if ( size > current ) - memset( (char*)Q + current, 0, size - current ); + MEM_Set( (char*)Q + current, 0, size - current ); *P = Q; return FT_Err_Ok; diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 24e4200b5..5d5bd345c 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -392,7 +392,7 @@ FT_Int result; - cff = face->extra.data; + cff = (CFF_Font *)face->extra.data; charset = &cff->charset; psnames = (PSNames_Interface*)FT_Get_Module_Interface( diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 1bf019521..cb5c0121a 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -60,8 +60,8 @@ CFF_Size_Get_Globals_Funcs( CFF_Size size ) { CFF_Face face = (CFF_Face)size->face; - CFF_Font* font = face->extra.data; - PSHinter_Interface* pshinter = font->pshinter; + CFF_Font* font = (CFF_Font *)face->extra.data; + PSHinter_Interface* pshinter = (PSHinter_Interface *)font->pshinter; FT_Module module; @@ -101,7 +101,7 @@ { PSH_Globals globals; CFF_Face face = (CFF_Face)size->face; - CFF_Font* font = face->extra.data; + CFF_Font* font = (CFF_Font *)face->extra.data; CFF_SubFont* subfont = &font->top_font; CFF_Private* cpriv = &subfont->private_dict; @@ -196,8 +196,8 @@ CFF_GlyphSlot_Init( CFF_GlyphSlot slot ) { CFF_Face face = (CFF_Face)slot->root.face; - CFF_Font* font = face->extra.data; - PSHinter_Interface* pshinter = font->pshinter; + CFF_Font* font = (CFF_Font *)face->extra.data; + PSHinter_Interface* pshinter = (PSHinter_Interface *)font->pshinter; if ( pshinter ) diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 80dbb6cbf..e1293d01d 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -58,8 +58,9 @@ PSHinter_Interface* pshinter; - face = (CID_Face) slot->root.face; - pshinter = face->pshinter; + face = (CID_Face)slot->root.face; + pshinter = (PSHinter_Interface *)face->pshinter; + if ( pshinter ) { @@ -93,7 +94,7 @@ CID_Size_Get_Globals_Funcs( CID_Size size ) { CID_Face face = (CID_Face)size->root.face; - PSHinter_Interface* pshinter = face->pshinter; + PSHinter_Interface* pshinter = (PSHinter_Interface *)face->pshinter; FT_Module module; diff --git a/src/pshinter/pshglob.h b/src/pshinter/pshglob.h index cce4ed2e8..9622f1c76 100644 --- a/src/pshinter/pshglob.h +++ b/src/pshinter/pshglob.h @@ -141,19 +141,14 @@ FT_BEGIN_HEADER } PSH_GlobalsRec; - typedef enum - { - PSH_BLUE_ALIGN_TOP = 1, - PSH_BLUE_ALIGN_BOT = 2 - - } PSH_Blue_Align; - +#define PSH_BLUE_ALIGN_TOP 1 +#define PSH_BLUE_ALIGN_BOT 2 typedef struct PSH_AlignmentRec_ { - PSH_Blue_Align align; - FT_Pos align_top; - FT_Pos align_bot; + int align; + FT_Pos align_top; + FT_Pos align_bot; } PSH_AlignmentRec, *PSH_Alignment; diff --git a/src/pshinter/pshmod.c b/src/pshinter/pshmod.c index 47d38baf7..afaf73a4e 100644 --- a/src/pshinter/pshmod.c +++ b/src/pshinter/pshmod.c @@ -91,8 +91,8 @@ } - FT_CALLBACK_DEF( PSHinter_Interface ) - pshinter_interface = + static + const PSHinter_Interface pshinter_interface = { pshinter_get_globals_funcs, pshinter_get_t1_funcs, diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 90361aae4..6cf54f3c7 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -58,8 +58,8 @@ static PSH_Globals_Funcs T1_Size_Get_Globals_Funcs( T1_Size size ) { - T1_Face face = (T1_Face) size->root.face; - PSHinter_Interface* pshinter = face->pshinter; + T1_Face face = (T1_Face)size->root.face; + PSHinter_Interface* pshinter = (PSHinter_Interface *)face->pshinter; FT_Module module; @@ -145,13 +145,15 @@ { T1_Face face; PSHinter_Interface* pshinter; - + + face = (T1_Face) slot->root.face; - pshinter = face->pshinter; - if (pshinter) + pshinter = (PSHinter_Interface *)face->pshinter; + if ( pshinter ) { FT_Module module; + module = FT_Get_Module( slot->root.face->driver->root.library, "pshinter" ); if (module) { |