Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/freetype/include/freetype/ftfntfmt.h

Issue 1413673003: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: DEPS for corpus Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /***************************************************************************/ 1 /***************************************************************************/
2 /* */ 2 /* */
3 /* ftxf86.h */ 3 /* ftfntfmt.h */
4 /* */ 4 /* */
5 /* Support functions for X11. */ 5 /* Support functions for font formats. */
6 /* */ 6 /* */
7 /* Copyright 2002-2004, 2006, 2007, 2013 by */ 7 /* Copyright 2002-2015 by */
8 /* David Turner, Robert Wilhelm, and Werner Lemberg. */ 8 /* David Turner, Robert Wilhelm, and Werner Lemberg. */
9 /* */ 9 /* */
10 /* This file is part of the FreeType project, and may only be used, */ 10 /* This file is part of the FreeType project, and may only be used, */
11 /* modified, and distributed under the terms of the FreeType project */ 11 /* modified, and distributed under the terms of the FreeType project */
12 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ 12 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */
13 /* this file you indicate that you have read the license and */ 13 /* this file you indicate that you have read the license and */
14 /* understand and accept it fully. */ 14 /* understand and accept it fully. */
15 /* */ 15 /* */
16 /***************************************************************************/ 16 /***************************************************************************/
17 17
18 18
19 #ifndef __FTXF86_H__ 19 #ifndef __FTFNTFMT_H__
20 #define __FTXF86_H__ 20 #define __FTFNTFMT_H__
21 21
22 #include <ft2build.h> 22 #include <ft2build.h>
23 #include FT_FREETYPE_H 23 #include FT_FREETYPE_H
24 24
25 #ifdef FREETYPE_H 25 #ifdef FREETYPE_H
26 #error "freetype.h of FreeType 1 has been loaded!" 26 #error "freetype.h of FreeType 1 has been loaded!"
27 #error "Please fix the directory search order for header files" 27 #error "Please fix the directory search order for header files"
28 #error "so that freetype.h of FreeType 2 is found first." 28 #error "so that freetype.h of FreeType 2 is found first."
29 #endif 29 #endif
30 30
(...skipping 11 matching lines...) Expand all
42 /* */ 42 /* */
43 /* <Abstract> */ 43 /* <Abstract> */
44 /* Getting the font format. */ 44 /* Getting the font format. */
45 /* */ 45 /* */
46 /* <Description> */ 46 /* <Description> */
47 /* The single function in this section can be used to get the font */ 47 /* The single function in this section can be used to get the font */
48 /* format. Note that this information is not needed normally; */ 48 /* format. Note that this information is not needed normally; */
49 /* however, there are special cases (like in PDF devices) where it is */ 49 /* however, there are special cases (like in PDF devices) where it is */
50 /* important to differentiate, in spite of FreeType's uniform API. */ 50 /* important to differentiate, in spite of FreeType's uniform API. */
51 /* */ 51 /* */
52 /* This function is in the X11/xf86 namespace for historical reasons */
53 /* and in no way depends on that windowing system. */
54 /* */
55 /*************************************************************************/ 52 /*************************************************************************/
56 53
57 54
58 /*************************************************************************/ 55 /*************************************************************************/
59 /* */ 56 /* */
60 /* <Function> */ 57 /* <Function> */
61 /* FT_Get_X11_Font_Format */ 58 /* FT_Get_Font_Format */
62 /* */ 59 /* */
63 /* <Description> */ 60 /* <Description> */
64 /* Return a string describing the format of a given face, using values */ 61 /* Return a string describing the format of a given face. Possible */
65 /* that can be used as an X11 FONT_PROPERTY. Possible values are */ 62 /* values are `TrueType', `Type~1', `BDF', `PCF', `Type~42', */
66 /* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */ 63 /* `CID~Type~1', `CFF', `PFR', and `Windows~FNT'. */
67 /* `PFR', and `Windows~FNT'. */ 64 /* */
65 /* The return value is suitable to be used as an X11 FONT_PROPERTY. */
68 /* */ 66 /* */
69 /* <Input> */ 67 /* <Input> */
70 /* face :: */ 68 /* face :: */
71 /* Input face handle. */ 69 /* Input face handle. */
72 /* */ 70 /* */
73 /* <Return> */ 71 /* <Return> */
74 /* Font format string. NULL in case of error. */ 72 /* Font format string. NULL in case of error. */
75 /* */ 73 /* */
74 /* <Note> */
75 /* A deprecated name for the same function is */
76 /* `FT_Get_X11_Font_Format'. */
77 /* */
78 FT_EXPORT( const char* )
79 FT_Get_Font_Format( FT_Face face );
80
81
82 /* deprecated */
76 FT_EXPORT( const char* ) 83 FT_EXPORT( const char* )
77 FT_Get_X11_Font_Format( FT_Face face ); 84 FT_Get_X11_Font_Format( FT_Face face );
78 85
86
79 /* */ 87 /* */
80 88
81 89
82 FT_END_HEADER 90 FT_END_HEADER
83 91
84 #endif /* __FTXF86_H__ */ 92 #endif /* __FTFNTFMT_H__ */
OLDNEW
« no previous file with comments | « third_party/freetype/include/freetype/fterrors.h ('k') | third_party/freetype/include/freetype/ftgasp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698