diff options
author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
tree | f99ea672d105271cb60a726fac8022ce47ea2866 /freetype/docs/reference/ft2-font_formats.html | |
parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'freetype/docs/reference/ft2-font_formats.html')
-rw-r--r-- | freetype/docs/reference/ft2-font_formats.html | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/freetype/docs/reference/ft2-font_formats.html b/freetype/docs/reference/ft2-font_formats.html index 508cee2a5..a0e5e5ebf 100644 --- a/freetype/docs/reference/ft2-font_formats.html +++ b/freetype/docs/reference/ft2-font_formats.html @@ -3,7 +3,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>FreeType-2.5.5 API Reference</title> +<title>FreeType-2.6 API Reference</title> <style type="text/css"> a:link { color: #0000EF; } a:visited { color: #51188E; } @@ -100,27 +100,32 @@ <body> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table> -<h1>FreeType-2.5.5 API Reference</h1> +<h1>FreeType-2.6 API Reference</h1> <h1>Font Formats</h1> <h2>Synopsis</h2> <table class="synopsis"> -<tr><td><a href="#FT_Get_X11_Font_Format">FT_Get_X11_Font_Format</a></td><td></td><td></td></tr> +<tr><td><a href="#FT_Get_Font_Format">FT_Get_Font_Format</a></td><td></td><td></td></tr> </table> <p>The single function in this section can be used to get the font format. Note that this information is not needed normally; however, there are special cases (like in PDF devices) where it is important to differentiate, in spite of FreeType's uniform API.</p> -<p>This function is in the X11/xf86 namespace for historical reasons and in no way depends on that windowing system.</p> <div class="section"> -<h3 id="FT_Get_X11_Font_Format">FT_Get_X11_Font_Format</h3> -<p>Defined in FT_XFREE86_H (ftxf86.h).</p> +<h3 id="FT_Get_Font_Format">FT_Get_Font_Format</h3> +<p>Defined in FT_FONT_FORMATS_H (ftfntfmt.h).</p> <pre> FT_EXPORT( <span class="keyword">const</span> <span class="keyword">char</span>* ) - <b>FT_Get_X11_Font_Format</b>( <a href="ft2-base_interface.html#FT_Face">FT_Face</a> face ); + <b>FT_Get_Font_Format</b>( <a href="ft2-base_interface.html#FT_Face">FT_Face</a> face ); + + + /* deprecated */ + FT_EXPORT( <span class="keyword">const</span> <span class="keyword">char</span>* ) + FT_Get_X11_Font_Format( <a href="ft2-base_interface.html#FT_Face">FT_Face</a> face ); </pre> -<p>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’.</p> +<p>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’.</p> +<p>The return value is suitable to be used as an X11 FONT_PROPERTY.</p> <h4>input</h4> <table class="fields"> @@ -132,6 +137,9 @@ <h4>return</h4> <p>Font format string. NULL in case of error.</p> +<h4>note</h4> +<p>A deprecated name for the same function is ‘FT_Get_X11_Font_Format’.</p> + <hr> <table class="index-toc-link"><tr><td class="left">[<a href="ft2-index.html">Index</a>]</td><td class="middle">[<a href="#">Top</a>]</td><td class="right">[<a href="ft2-toc.html">TOC</a>]</td></tr></table></div> |