Commit b93b0f5f7d396746b9a9e2b9916d9a0289974ebc
2002-03-14T09:28:51
* include/freetype/internal/ftobjs.h, src/base/ftapi.c, src/base/ftobjs.c: updated a few face method definitions: FT_PSName_Requester => FT_Face_GetPostscriptNameFunc FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
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
diff --git a/ChangeLog b/ChangeLog
index 8f6b038..10290b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,14 @@
src/winfonts/winfnt.c, src/winfonts/winfnt.h:
updating the type definitions for font font drivers
+ * include/freetype/internal/ftobjs.h,
+ src/base/ftapi.c, src/base/ftobjs.c: updated a few face method
+ definitions:
+
+ FT_PSName_Requester => FT_Face_GetPostscriptNameFunc
+ FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
+ FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
+
2002-03-13 Antoine Leca <antoine@oriolnet.com>
* include/freetype/config/ftoption.h: changed the automatic detection
diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h
index 9e9de88..6459c6c 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -580,7 +580,7 @@ FT_BEGIN_HEADER
typedef struct FT_DriverRec_
{
FT_ModuleRec root;
- FT_Driver_Class clazz;
+ FT_Driver_Class clazz;
FT_ListRec faces_list;
void* extensions;
@@ -688,17 +688,17 @@ FT_BEGIN_HEADER
FT_UInt render_mode );
typedef const char*
- (*FT_PSName_Requester)( FT_Face face );
+ (*FT_Face_GetPostscriptNameFunc)( FT_Face face );
typedef FT_Error
- (*FT_Glyph_Name_Requester)( FT_Face face,
- FT_UInt glyph_index,
- FT_Pointer buffer,
- FT_UInt buffer_max );
+ (*FT_Face_GetGlyphNameFunc)( FT_Face face,
+ FT_UInt glyph_index,
+ FT_Pointer buffer,
+ FT_UInt buffer_max );
typedef FT_UInt
- (*FT_Name_Index_Requester)( FT_Face face,
- FT_String* glyph_name );
+ (*FT_Face_GetGlyphNameIndexFunc)( FT_Face face,
+ FT_String* glyph_name );
#ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM
diff --git a/src/base/ftapi.c b/src/base/ftapi.c
index fff2dbe..2e5b18a 100644
--- a/src/base/ftapi.c
+++ b/src/base/ftapi.c
@@ -1188,10 +1188,10 @@
if ( clazz->get_interface )
{
- FT_Name_Index_Requester requester;
+ FT_Face_GetGlyphNameIndexFunc requester;
- requester = (FT_Name_Index_Requester)clazz->get_interface(
+ requester = (FT_Face_GetGlyphNameIndexFunc)clazz->get_interface(
FT_MODULE( driver ), "name_index" );
if ( requester )
result = requester( face, glyph_name );
@@ -1228,10 +1228,10 @@
if ( clazz->get_interface )
{
- FT_Glyph_Name_Requester requester;
+ FT_Face_GetGlyphNameFunc requester;
- requester = (FT_Glyph_Name_Requester)clazz->get_interface(
+ requester = (FT_Face_GetGlyphNameFunc)clazz->get_interface(
FT_MODULE( driver ), "glyph_name" );
if ( requester )
error = requester( face, glyph_index, buffer, buffer_max );
@@ -1263,10 +1263,10 @@
if ( clazz->get_interface )
{
- FT_PSName_Requester requester;
+ FT_Face_GetPostscriptNameFunc requester;
- requester = (FT_PSName_Requester)clazz->get_interface(
+ requester = (FT_Face_GetPostscriptNameFunc)clazz->get_interface(
FT_MODULE( driver ), "postscript_name" );
if ( requester )
result = requester( face );
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index ef778d9..b2766c3 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -1547,10 +1547,10 @@
if ( clazz->get_interface )
{
- FT_Name_Index_Requester requester;
+ FT_Face_GetGlyphNameIndexFunc requester;
- requester = (FT_Name_Index_Requester)clazz->get_interface(
+ requester = (FT_Face_GetGlyphNameIndexFunc)clazz->get_interface(
FT_MODULE( driver ), "name_index" );
if ( requester )
result = requester( face, glyph_name );
@@ -1587,10 +1587,10 @@
if ( clazz->get_interface )
{
- FT_Glyph_Name_Requester requester;
+ FT_Face_GetGlyphNameFunc requester;
- requester = (FT_Glyph_Name_Requester)clazz->get_interface(
+ requester = (FT_Face_GetGlyphNameFunc)clazz->get_interface(
FT_MODULE( driver ), "glyph_name" );
if ( requester )
error = requester( face, glyph_index, buffer, buffer_max );
@@ -1622,10 +1622,10 @@
if ( clazz->get_interface )
{
- FT_PSName_Requester requester;
+ FT_Face_GetPostscriptNameFunc requester;
- requester = (FT_PSName_Requester)clazz->get_interface(
+ requester = (FT_Face_GetPostscriptNameFunc)clazz->get_interface(
FT_MODULE( driver ), "postscript_name" );
if ( requester )
result = requester( face );