forked from minhngoc25a/freetype2
Rename `FT_Get_X11_Font_Format' to `FT_Get_Font_Format'.
* include/ftfntfmt.h, src/base/ftfntfmt.c: Implement it. * docs/CHANGES: Updated.
This commit is contained in:
Werner Lemberg
parent
3e58779675
commit
f4d1c11faa
|
|
@ -1,3 +1,11 @@
|
|||
2015-03-11 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
[base] Rename `FT_Get_X11_Font_Format' to `FT_Get_Font_Format'.
|
||||
|
||||
* include/ftfntfmt.h, src/base/ftfntfmt.c: Implement it.
|
||||
|
||||
* docs/CHANGES: Updated.
|
||||
|
||||
2015-03-11 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
Fix automatic copyright updating.
|
||||
|
|
|
|||
|
|
@ -34,10 +34,15 @@ CHANGES BETWEEN 2.5.5 and 2.6
|
|||
This change doesn't break the ABI; however, it might cause
|
||||
compiler warnings.
|
||||
|
||||
- Function `FT_Bitmap_New' has been renamed to `FT_Bitmap_Init',
|
||||
since this name better reflects its function. For backwards
|
||||
- Function `FT_Bitmap_New' has been renamed to `FT_Bitmap_Init',
|
||||
since this name better reflects its function. For backwards
|
||||
compatibility, the old function name is still available.
|
||||
|
||||
- Function `FT_Get_X11_Font_Format' has been renamed to
|
||||
`FT_Get_Font_Format', since this name better reflects its
|
||||
function. For backwards compatibility, the old function name is
|
||||
still available.
|
||||
|
||||
|
||||
======================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* */
|
||||
/* ftfntfmt.h */
|
||||
/* */
|
||||
/* Support functions for X11. */
|
||||
/* Support functions for font formats. */
|
||||
/* */
|
||||
/* Copyright 2002-2015 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
|
|
@ -49,22 +49,20 @@ FT_BEGIN_HEADER
|
|||
/* however, there are special cases (like in PDF devices) where it is */
|
||||
/* important to differentiate, in spite of FreeType's uniform API. */
|
||||
/* */
|
||||
/* This function is in the X11/xf86 namespace for historical reasons */
|
||||
/* and in no way depends on that windowing system. */
|
||||
/* */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* <Function> */
|
||||
/* FT_Get_X11_Font_Format */
|
||||
/* FT_Get_Font_Format */
|
||||
/* */
|
||||
/* <Description> */
|
||||
/* Return a string describing the format of a given face, using values */
|
||||
/* that can be used as an X11 FONT_PROPERTY. Possible values are */
|
||||
/* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
|
||||
/* `PFR', and `Windows~FNT'. */
|
||||
/* Return a string describing the format of a given face. Possible */
|
||||
/* values are `TrueType', `Type~1', `BDF', `PCF', `Type~42', */
|
||||
/* `CID~Type~1', `CFF', `PFR', and `Windows~FNT'. */
|
||||
/* */
|
||||
/* The return value is suitable to be used as an X11 FONT_PROPERTY. */
|
||||
/* */
|
||||
/* <Input> */
|
||||
/* face :: */
|
||||
|
|
@ -73,9 +71,19 @@ FT_BEGIN_HEADER
|
|||
/* <Return> */
|
||||
/* Font format string. NULL in case of error. */
|
||||
/* */
|
||||
/* <Note> */
|
||||
/* A deprecated name for the same function is */
|
||||
/* `FT_Get_X11_Font_Format'. */
|
||||
/* */
|
||||
FT_EXPORT( const char* )
|
||||
FT_Get_Font_Format( FT_Face face );
|
||||
|
||||
|
||||
/* deprecated */
|
||||
FT_EXPORT( const char* )
|
||||
FT_Get_X11_Font_Format( FT_Face face );
|
||||
|
||||
|
||||
/* */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ BASE_EXTENSIONS += ftbitmap.c
|
|||
# See include/ftcid.h for the API.
|
||||
BASE_EXTENSIONS += ftcid.c
|
||||
|
||||
# Support functions for X11.
|
||||
# Support functions for font formats.
|
||||
#
|
||||
# See include/ftfntfmt.h for the API.
|
||||
BASE_EXTENSIONS += ftfntfmt.c
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* */
|
||||
/* ftfntfmt.c */
|
||||
/* */
|
||||
/* FreeType utility file for X11 support (body). */
|
||||
/* FreeType utility file for font formats (body). */
|
||||
/* */
|
||||
/* Copyright 2002-2015 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||
|
|
@ -24,6 +24,21 @@
|
|||
|
||||
/* documentation is in ftfntfmt.h */
|
||||
|
||||
FT_EXPORT_DEF( const char* )
|
||||
FT_Get_Font_Format( FT_Face face )
|
||||
{
|
||||
const char* result = NULL;
|
||||
|
||||
|
||||
if ( face )
|
||||
FT_FACE_FIND_SERVICE( face, result, XF86_NAME );
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/* deprecated function name; retained for ABI compatibility */
|
||||
|
||||
FT_EXPORT_DEF( const char* )
|
||||
FT_Get_X11_Font_Format( FT_Face face )
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue