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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: include/freetype/internal/services/svpsinfo.h

Issue 23555005: Update freetype to the latest version of Android external/freetype (Closed) Base URL: https://chromium.googlesource.com/chromium/src/third_party/freetype.git@master
Patch Set: Created 7 years, 3 months 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
« no previous file with comments | « include/freetype/internal/services/svpscmap.h ('k') | include/freetype/internal/services/svsfnt.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /***************************************************************************/ 1 /***************************************************************************/
2 /* */ 2 /* */
3 /* svpsinfo.h */ 3 /* svpsinfo.h */
4 /* */ 4 /* */
5 /* The FreeType PostScript info service (specification). */ 5 /* The FreeType PostScript info service (specification). */
6 /* */ 6 /* */
7 /* Copyright 2003, 2004, 2009 by */ 7 /* Copyright 2003, 2004, 2009, 2011, 2012 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
(...skipping 13 matching lines...) Expand all
31 31
32 typedef FT_Error 32 typedef FT_Error
33 (*PS_GetFontInfoFunc)( FT_Face face, 33 (*PS_GetFontInfoFunc)( FT_Face face,
34 PS_FontInfoRec* afont_info ); 34 PS_FontInfoRec* afont_info );
35 35
36 typedef FT_Error 36 typedef FT_Error
37 (*PS_GetFontExtraFunc)( FT_Face face, 37 (*PS_GetFontExtraFunc)( FT_Face face,
38 PS_FontExtraRec* afont_extra ); 38 PS_FontExtraRec* afont_extra );
39 39
40 typedef FT_Int 40 typedef FT_Int
41 (*PS_HasGlyphNamesFunc)( FT_Face face ); 41 (*PS_HasGlyphNamesFunc)( FT_Face face );
42 42
43 typedef FT_Error 43 typedef FT_Error
44 (*PS_GetFontPrivateFunc)( FT_Face face, 44 (*PS_GetFontPrivateFunc)( FT_Face face,
45 PS_PrivateRec* afont_private ); 45 PS_PrivateRec* afont_private );
46 46
47 typedef FT_Long
48 (*PS_GetFontValueFunc)( FT_Face face,
49 PS_Dict_Keys key,
50 FT_UInt idx,
51 void *value,
52 FT_Long value_len );
53
47 54
48 FT_DEFINE_SERVICE( PsInfo ) 55 FT_DEFINE_SERVICE( PsInfo )
49 { 56 {
50 PS_GetFontInfoFunc ps_get_font_info; 57 PS_GetFontInfoFunc ps_get_font_info;
51 PS_GetFontExtraFunc ps_get_font_extra; 58 PS_GetFontExtraFunc ps_get_font_extra;
52 PS_HasGlyphNamesFunc ps_has_glyph_names; 59 PS_HasGlyphNamesFunc ps_has_glyph_names;
53 PS_GetFontPrivateFunc ps_get_font_private; 60 PS_GetFontPrivateFunc ps_get_font_private;
61 PS_GetFontValueFunc ps_get_font_value;
54 }; 62 };
55 63
64
56 #ifndef FT_CONFIG_OPTION_PIC 65 #ifndef FT_CONFIG_OPTION_PIC
57 66
58 #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \ 67 #define FT_DEFINE_SERVICE_PSINFOREC( class_, \
59 ps_get_font_extra_, has_glyph_names_, get_font_private_) \ 68 get_font_info_, \
60 static const FT_Service_PsInfoRec class_ = \ 69 ps_get_font_extra_, \
70 has_glyph_names_, \
71 get_font_private_, \
72 get_font_value_ ) \
73 static const FT_Service_PsInfoRec class_ = \
61 { \ 74 { \
62 get_font_info_, ps_get_font_extra_, has_glyph_names_, \ 75 get_font_info_, ps_get_font_extra_, has_glyph_names_, \
63 get_font_private_ \ 76 get_font_private_, get_font_value_ \
64 }; 77 };
65 78
66 #else /* FT_CONFIG_OPTION_PIC */ 79 #else /* FT_CONFIG_OPTION_PIC */
67 80
68 #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \ 81 #define FT_DEFINE_SERVICE_PSINFOREC( class_, \
69 ps_get_font_extra_, has_glyph_names_, get_font_private_) \ 82 get_font_info_, \
83 ps_get_font_extra_, \
84 has_glyph_names_, \
85 get_font_private_, \
86 get_font_value_ ) \
70 void \ 87 void \
71 FT_Init_Class_##class_( FT_Library library, \ 88 FT_Init_Class_ ## class_( FT_Library library, \
72 FT_Service_PsInfoRec* clazz) \ 89 FT_Service_PsInfoRec* clazz ) \
73 { \ 90 { \
74 FT_UNUSED(library); \ 91 FT_UNUSED( library ); \
75 clazz->ps_get_font_info = get_font_info_; \ 92 \
76 clazz->ps_get_font_extra = ps_get_font_extra_; \ 93 clazz->ps_get_font_info = get_font_info_; \
77 clazz->ps_has_glyph_names = has_glyph_names_; \ 94 clazz->ps_get_font_extra = ps_get_font_extra_; \
95 clazz->ps_has_glyph_names = has_glyph_names_; \
78 clazz->ps_get_font_private = get_font_private_; \ 96 clazz->ps_get_font_private = get_font_private_; \
79 } 97 clazz->ps_get_font_value = get_font_value_; \
98 }
80 99
81 #endif /* FT_CONFIG_OPTION_PIC */ 100 #endif /* FT_CONFIG_OPTION_PIC */
82 101
83 /* */ 102 /* */
84 103
85 104
86 FT_END_HEADER 105 FT_END_HEADER
87 106
88 107
89 #endif /* __SVPSINFO_H__ */ 108 #endif /* __SVPSINFO_H__ */
90 109
91 110
92 /* END */ 111 /* END */
OLDNEW
« no previous file with comments | « include/freetype/internal/services/svpscmap.h ('k') | include/freetype/internal/services/svsfnt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698