Commit 4bd5d0a34443905bf20ae95f25c8fe5e56199300
2002-03-20T09:42:31
formatting
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index e35e0b5..161a8b5 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -131,7 +131,7 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_GlobalResetFunc */
+ /* FT_AutoHinter_GlobalResetFunc */
/* */
/* <Description> */
/* 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 e6fab95..96241db 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 060661a..2b3ab07 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 de61134..85ef79b 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 2285056..bc0290c 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 a21f16f..6feeef8 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" );
-
- face->psnames = psnames;
- }
-
- psaux = (PSAux_Service)face->psaux;
- if ( !psaux )
- {
- psaux = (PSAux_Service)
- FT_Get_Module_Interface( FT_FACE_LIBRARY( face ), "psaux" );
+ psnames = face->psnames = (PSNames_Service)
+ FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psnames" );
- face->psaux = psaux;
- }
+ psaux = face->psaux = (PSAux_Service)
+ FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "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 9fbbccd..299930b 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 )