Commit 9657ef0598f29d50344956e6c7e2923ad9137bd3
2002-03-14T08:49:59
* include/freetype/internal/autohint.h, src/autohint/ahmodule.c, src/base/ftapi.c, src/base/ftobjs.c: updating the type definitions for the auto-hinter module. (i.e. FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec, FT_AutoHinter_Interface* => FT_AutoHinter_Service, etc..)
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 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242
diff --git a/ChangeLog b/ChangeLog
index 96c9a39..209deba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-14 David Turner <david@freetype.org>
+
+ * include/freetype/internal/autohint.h, src/autohint/ahmodule.c,
+ src/base/ftapi.c, src/base/ftobjs.c: updating the type definitions for
+ the auto-hinter module.
+
+ (i.e. FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec,
+ FT_AutoHinter_Interface* => FT_AutoHinter_Service, etc..)
+
+
+
2002-03-13 Antoine Leca <antoine@oriolnet.com>
* include/freetype/config/ftoption.h: changed the automatic detection
diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h
index 40ade95..e35e0b5 100644
--- a/include/freetype/internal/autohint.h
+++ b/include/freetype/internal/autohint.h
@@ -83,13 +83,13 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_Get_Global_Func */
+ /* FT_AutoHinter_GlobalGetFunc */
/* */
/* <Description> */
/* Retrieves the global hints computed for a given face object the */
/* resulting data is dissociated from the face and will survive a */
/* call to FT_Done_Face(). It must be discarded through the API */
- /* FT_AutoHinter_Done_Global_Func(). */
+ /* FT_AutoHinter_GlobalDoneFunc (). */
/* */
/* <Input> */
/* hinter :: A handle to the source auto-hinter. */
@@ -102,7 +102,7 @@ FT_BEGIN_HEADER
/* global_len :: The size in bytes of the global hints. */
/* */
typedef void
- (*FT_AutoHinter_Get_Global_Func)( FT_AutoHinter hinter,
+ (*FT_AutoHinter_GlobalGetFunc )( FT_AutoHinter hinter,
FT_Face face,
void** global_hints,
long* global_len );
@@ -111,11 +111,11 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_Done_Global_Func */
+ /* FT_AutoHinter_GlobalDoneFunc */
/* */
/* <Description> */
/* Discards the global hints retrieved through */
- /* FT_AutoHinter_Get_Global_Func(). This is the only way these hints */
+ /* FT_AutoHinter_GlobalGetFunc (). This is the only way these hints */
/* are freed from memory. */
/* */
/* <Input> */
@@ -124,14 +124,14 @@ FT_BEGIN_HEADER
/* global :: A pointer to retrieved global hints to discard. */
/* */
typedef void
- (*FT_AutoHinter_Done_Global_Func)( FT_AutoHinter hinter,
+ (*FT_AutoHinter_GlobalDoneFunc )( FT_AutoHinter hinter,
void* global );
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_Reset_Func */
+ /* FT_AutoHinter_GlobalResetFunc */
/* */
/* <Description> */
/* This function is used to recompute the global metrics in a given */
@@ -144,14 +144,14 @@ FT_BEGIN_HEADER
/* face :: A handle to the face. */
/* */
typedef void
- (*FT_AutoHinter_Reset_Func)( FT_AutoHinter hinter,
+ (*FT_AutoHinter_GlobalResetFunc )( FT_AutoHinter hinter,
FT_Face face );
/*************************************************************************/
/* */
/* <FuncType> */
- /* FT_AutoHinter_Load_Func */
+ /* FT_AutoHinter_GlyphLoadFunc */
/* */
/* <Description> */
/* This function is used to load, scale, and automatically hint a */
@@ -170,31 +170,29 @@ FT_BEGIN_HEADER
/* FT_LOAD_NO_SCALE set. */
/* */
typedef FT_Error
- (*FT_AutoHinter_Load_Func)( FT_AutoHinter hinter,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_ULong load_flags );
+ (*FT_AutoHinter_GlyphLoadFunc)( FT_AutoHinter hinter,
+ FT_GlyphSlot slot,
+ FT_Size size,
+ FT_UInt glyph_index,
+ FT_ULong load_flags );
/*************************************************************************/
/* */
/* <Struct> */
- /* FT_AutoHinter_Interface */
+ /* FT_AutoHinter_ServiceRec */
/* */
/* <Description> */
/* The auto-hinter module's interface. */
/* */
- typedef struct FT_AutoHinter_Interface
+ typedef struct FT_AutoHinter_ServiceRec_
{
- FT_AutoHinter_Reset_Func reset_face;
- FT_AutoHinter_Load_Func load_glyph;
-
- FT_AutoHinter_Get_Global_Func get_global_hints;
- FT_AutoHinter_Done_Global_Func done_global_hints;
-
- } FT_AutoHinter_Interface;
+ FT_AutoHinter_GlobalResetFunc reset_face;
+ FT_AutoHinter_GlobalGetFunc get_global_hints;
+ FT_AutoHinter_GlobalDoneFunc done_global_hints;
+ FT_AutoHinter_GlyphLoadFunc load_glyph;
+ } FT_AutoHinter_ServiceRec, *FT_AutoHinter_Service;
FT_END_HEADER
diff --git a/src/autohint/ahmodule.c b/src/autohint/ahmodule.c
index f8d54b9..66f275d 100644
--- a/src/autohint/ahmodule.c
+++ b/src/autohint/ahmodule.c
@@ -64,11 +64,11 @@
FT_CALLBACK_DEF( FT_Error )
- ft_autohinter_load( FT_AutoHinter module,
- FT_GlyphSlot slot,
- FT_Size size,
- FT_UInt glyph_index,
- FT_ULong load_flags )
+ ft_autohinter_load_glyph( FT_AutoHinter module,
+ FT_GlyphSlot slot,
+ FT_Size size,
+ FT_UInt glyph_index,
+ FT_ULong load_flags )
{
return ah_hinter_load_glyph( module->hinter,
slot, size, glyph_index, load_flags );
@@ -76,8 +76,8 @@
FT_CALLBACK_DEF( void )
- ft_autohinter_reset( FT_AutoHinter module,
- FT_Face face )
+ ft_autohinter_reset_globals( FT_AutoHinter module,
+ FT_Face face )
{
FT_UNUSED( module );
@@ -106,12 +106,12 @@
FT_CALLBACK_TABLE_DEF
- const FT_AutoHinter_Interface autohinter_interface =
+ const FT_AutoHinter_ServiceRec ft_autohinter_service =
{
- ft_autohinter_reset,
- ft_autohinter_load,
+ ft_autohinter_reset_globals,
ft_autohinter_get_globals,
- ft_autohinter_done_globals
+ ft_autohinter_done_globals,
+ ft_autohinter_load_glyph
};
@@ -125,7 +125,7 @@
0x10000L, /* version 1.0 of the autohinter */
0x20000L, /* requires FreeType 2.0 or above */
- (const void*)&autohinter_interface,
+ (const void*) &ft_autohinter_service,
(FT_Module_Constructor)ft_autohinter_init,
(FT_Module_Destructor) ft_autohinter_done,
diff --git a/src/base/ftapi.c b/src/base/ftapi.c
index 8ae8e81..455b0b2 100644
--- a/src/base/ftapi.c
+++ b/src/base/ftapi.c
@@ -140,7 +140,7 @@
if ( autohint )
{
- FT_AutoHinter_Interface* hinting;
+ FT_AutoHinter_Service hinting;
/* try to load embedded bitmaps first if available */
@@ -159,7 +159,7 @@
}
/* load auto-hinted outline */
- hinting = (FT_AutoHinter_Interface*)hinter->clazz->module_interface;
+ hinting = (FT_AutoHinter_Service)hinter->clazz->module_interface;
error = hinting->load_glyph( (FT_AutoHinter)hinter,
slot, face->size,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index f4d7af3..7b4d089 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -407,7 +407,7 @@
if ( autohint )
{
- FT_AutoHinter_Interface* hinting;
+ FT_AutoHinter_Service hinting;
/* try to load embedded bitmaps first if available */
@@ -426,7 +426,7 @@
}
/* load auto-hinted outline */
- hinting = (FT_AutoHinter_Interface*)hinter->clazz->module_interface;
+ hinting = (FT_AutoHinter_Service)hinter->clazz->module_interface;
error = hinting->load_glyph( (FT_AutoHinter)hinter,
slot, face->size,