ref: 4bd5d0a34443905bf20ae95f25c8fe5e56199300
parent: eba5ad4b37080ae2212241491ecc029591841b16
author: David Turner <[email protected]>
date: Wed Mar 20 04:42:31 EST 2002
formatting
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -131,7 +131,7 @@
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_GlobalResetFunc */
+ /* FT_AutoHinter_GlobalResetFunc */
/* */
/* <Description> */
/* This function is used to recompute the global metrics in a given */
--- a/include/freetype/internal/sfnt.h
+++ b/include/freetype/internal/sfnt.h
@@ -163,9 +163,9 @@
/* */
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 );
/*************************************************************************/
--- 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;
--- 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;
--- a/src/type1/t1cmap.h
+++ b/src/type1/t1cmap.h
@@ -11,11 +11,9 @@
/***************************************************************************/
/***************************************************************************/
- 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 @@
/***************************************************************************/
/***************************************************************************/
- 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_
--- 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 );
--- 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 )