formatting

This commit is contained in:
David Turner 2002-03-20 09:42:31 +00:00
parent eba5ad4b37
commit 4bd5d0a344
7 changed files with 21 additions and 40 deletions

View File

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

View File

@ -11,10 +11,8 @@ FT_BEGIN_HEADER
/***************************************************************************/
/***************************************************************************/
typedef struct T1_CMapStrRec_* T1_CMapStd;
typedef struct T1_CMapUnicodeRec_* T1_CMapUnicode;
/* standard (and expert) encoding cmaps */
typedef struct T1_CMapStdRec_* T1_CMapStd;
typedef struct T1_CMapStdRec_
{
@ -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_

View File

@ -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 );