From f3caf22dad2990d54272c07cff2187f024e54010 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 20 Mar 2002 09:42:31 +0000 Subject: [PATCH] formatting --- include/freetype/internal/autohint.h | 2 +- include/freetype/internal/sfnt.h | 6 +++--- src/base/ftgloadr.c | 2 +- src/type1/t1cmap.c | 4 ++-- src/type1/t1cmap.h | 13 ++++++------ src/type1/t1objs.c | 30 ++++++---------------------- src/winfonts/winfnt.c | 4 ++-- 7 files changed, 21 insertions(+), 40 deletions(-) diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h index e35e0b57f..161a8b5f2 100644 --- a/include/freetype/internal/autohint.h +++ b/include/freetype/internal/autohint.h @@ -131,7 +131,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* */ /* */ - /* FT_AutoHinter_GlobalResetFunc */ + /* FT_AutoHinter_GlobalResetFunc */ /* */ /* */ /* This function is used to recompute the global metrics in a given */ diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h index e6fab9570..96241db00 100644 --- a/include/freetype/internal/sfnt.h +++ b/include/freetype/internal/sfnt.h @@ -163,9 +163,9 @@ FT_BEGIN_HEADER /* */ typedef FT_Error (*TT_Load_SFNT_HeaderRec_Func)( TT_Face face, - FT_Stream stream, - FT_Long face_index, - SFNT_Header sfnt ); + FT_Stream stream, + FT_Long face_index, + SFNT_Header sfnt ); /*************************************************************************/ diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 060661a1f..2b3ab075a 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -305,7 +305,7 @@ FT_BASE_DEF( FT_Error ) FT_GlyphLoader_CopyPoints( FT_GlyphLoader target, - FT_GlyphLoader source ) + FT_GlyphLoader source ) { FT_Error error; FT_UInt num_points = source->base.outline.n_points; diff --git a/src/type1/t1cmap.c b/src/type1/t1cmap.c index de6113476..85ef79b0c 100644 --- a/src/type1/t1cmap.c +++ b/src/type1/t1cmap.c @@ -126,7 +126,7 @@ return 0; } - FT_CALLBACK_TABLE const T1_CMap_ClassRec + FT_CALLBACK_TABLE const FT_CMap_ClassRec t1_cmap_expert_class_rec = { sizeof( T1_CMapStdRec ), @@ -138,7 +138,7 @@ }; - FT_LOCAL_DEF( T1_CMap_Class ) + FT_LOCAL_DEF( FT_CMap_Class ) t1_cmap_expert_class = &t1_cmap_expert_class_rec; diff --git a/src/type1/t1cmap.h b/src/type1/t1cmap.h index 228505614..bc0290c08 100644 --- a/src/type1/t1cmap.h +++ b/src/type1/t1cmap.h @@ -11,11 +11,9 @@ FT_BEGIN_HEADER /***************************************************************************/ /***************************************************************************/ - typedef struct T1_CMapStrRec_* T1_CMapStd; + /* standard (and expert) encoding cmaps */ + typedef struct T1_CMapStdRec_* T1_CMapStd; - typedef struct T1_CMapUnicodeRec_* T1_CMapUnicode; - - typedef struct T1_CMapStdRec_ { FT_CMapRec cmap; @@ -64,14 +62,15 @@ FT_BEGIN_HEADER /***************************************************************************/ /***************************************************************************/ - typedef struct T1_CMapUniPairRec_* T1_CMapUniPair; - + /* unicode (syntehtic) cmaps */ + typedef struct T1_CMapUnicodeRec_* T1_CMapUnicode; + typedef struct T1_CMapUniPairRec_ { FT_UInt32 unicode; FT_UInt gindex; - } T1_CMapUniPairRec; + } T1_CMapUniPairRec, *T1_CMapUniPair; typedef struct T1_CMapUnicodeRec_ diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index a21f16f84..6feeef8d9 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -290,32 +290,14 @@ face->root.num_faces = 1; - psnames = (PSNames_Service)face->psnames; - if ( !psnames ) - { - psnames = (PSNames_Service) - FT_Get_Module_Interface( FT_FACE_LIBRARY( face ), "psnames" ); + psnames = face->psnames = (PSNames_Service) + FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psnames" ); - face->psnames = psnames; - } + psaux = face->psaux = (PSAux_Service) + FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psaux" ); - psaux = (PSAux_Service)face->psaux; - if ( !psaux ) - { - psaux = (PSAux_Service) - FT_Get_Module_Interface( FT_FACE_LIBRARY( face ), "psaux" ); - - face->psaux = psaux; - } - - pshinter = (PSHinter_Service)face->pshinter; - if ( !pshinter ) - { - pshinter = (PSHinter_Service) - FT_Get_Module_Interface( FT_FACE_LIBRARY( face ), "pshinter" ); - - face->pshinter = pshinter; - } + pshinter = face->pshinter = (PSHinter_Service) + FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "pshinter" ); /* open the tokenizer, this will also check the font format */ error = T1_Open_Face( face ); diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 9fbbccd40..299930b17 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -325,7 +325,7 @@ static FT_Error fnt_cmap_init( FT_CMap cmap ) { - FNT_Face face = (FNT_Face) FT_CMAP_FACE(cmap); + FNT_Face face = (FNT_Face) FT_CMAP_FACE(cmap); FNT_Font font = face->fonts; cmap->first = (FT_UInt32) font->header.first_char; @@ -339,7 +339,7 @@ fnt_cmap_char_index( FT_CMap cmap, FT_UInt32 char_code ) { - FT_UInt gindex = 0; + FT_UInt gindex = 0; char_code -= cmap->first; if ( char_code < cmap->count )