ref: b93b0f5f7d396746b9a9e2b9916d9a0289974ebc
parent: ef3c12650edd2dfa462f661596f3f62843846c1c
author: David Turner <[email protected]>
date: Thu Mar 14 04:28:51 EST 2002
* 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
--- 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 <[email protected]>
* include/freetype/config/ftoption.h: changed the automatic detection
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -580,7 +580,7 @@
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_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
--- 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 );
--- 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 );