minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Provide dummy functions if `TT_CONFIG_OPTION_SFNT_NAMES' is not set. 

* src/base/ftsnames.c [!TT_CONFIG_OPTION_SFNT_NAMES]: Implement it.
This commit is contained in:
Werner Lemberg 2018-05-14 09:42:20 +02:00
parent 78db8a2570
commit c5a8a5350a
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2018-05-14 Werner Lemberg <wl@gnu.org>
Provide dummy functions if `TT_CONFIG_OPTION_SFNT_NAMES' is not set.
* src/base/ftsnames.c [!TT_CONFIG_OPTION_SFNT_NAMES]: Implement it.
2018-05-13 Werner Lemberg <wl@gnu.org>
* src/base/ftobjs.c (FT_Load_Glyph): Improve tracing.

10
include/freetype/ftsnames.h
View File

@ -130,6 +130,10 @@ FT_BEGIN_HEADER
/* <Return> */
/* The number of strings in the `name' table. */
/* */
/* <Note> */
/* This function always returns an error if the config macro */
/* `TT_CONFIG_OPTION_SFNT_NAMES' is not defined in `ftoption.h'. */
/* */
FT_EXPORT( FT_UInt )
FT_Get_Sfnt_Name_Count( FT_Face face );
@ -165,6 +169,9 @@ FT_BEGIN_HEADER
/* `name' table format~1 entries can use language tags also, see */
/* @FT_Get_Sfnt_LangTag. */
/* */
/* This function always returns an error if the config macro */
/* `TT_CONFIG_OPTION_SFNT_NAMES' is not defined in `ftoption.h'. */
/* */
FT_EXPORT( FT_Error )
FT_Get_Sfnt_Name( FT_Face face,
FT_UInt idx,
@ -233,6 +240,9 @@ FT_BEGIN_HEADER
/* invalid format~1 language ID values, FT_Err_Invalid_Argument is */
/* returned. */
/* */
/* This function always returns an error if the config macro */
/* `TT_CONFIG_OPTION_SFNT_NAMES' is not defined in `ftoption.h'. */
/* */
/* <Since> */
/* 2.8 */
/* */

40
src/base/ftsnames.c
View File

@ -142,7 +142,45 @@
}
#endif /* TT_CONFIG_OPTION_SFNT_NAMES */
#else /* !TT_CONFIG_OPTION_SFNT_NAMES */
FT_EXPORT_DEF( FT_UInt )
FT_Get_Sfnt_Name_Count( FT_Face face )
{
FT_UNUSED( face );
return 0;
}
FT_EXPORT_DEF( FT_Error )
FT_Get_Sfnt_Name( FT_Face face,
FT_UInt idx,
FT_SfntName *aname )
{
FT_UNUSED( face );
FT_UNUSED( idx );
FT_UNUSED( aname );
return FT_THROW( Unimplemented_Feature );
}
FT_EXPORT_DEF( FT_Error )
FT_Get_Sfnt_LangTag( FT_Face face,
FT_UInt langID,
FT_SfntLangTag *alangTag )
{
FT_UNUSED( face );
FT_UNUSED( langID );
FT_UNUSED( alangTag );
return FT_THROW( Unimplemented_Feature );
}
#endif /* !TT_CONFIG_OPTION_SFNT_NAMES */
/* END */