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

Side by Side Diff: include/freetype/internal/services/svgldict.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/svcid.h ('k') | include/freetype/internal/services/svmm.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 /* svgldict.h */ 3 /* svgldict.h */
4 /* */ 4 /* */
5 /* The FreeType glyph dictionary services (specification). */ 5 /* The FreeType glyph dictionary services (specification). */
6 /* */ 6 /* */
7 /* Copyright 2003 by */ 7 /* Copyright 2003, 2009, 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 26 matching lines...) Expand all
44 (*FT_GlyphDict_NameIndexFunc)( FT_Face face, 44 (*FT_GlyphDict_NameIndexFunc)( FT_Face face,
45 FT_String* glyph_name ); 45 FT_String* glyph_name );
46 46
47 47
48 FT_DEFINE_SERVICE( GlyphDict ) 48 FT_DEFINE_SERVICE( GlyphDict )
49 { 49 {
50 FT_GlyphDict_GetNameFunc get_name; 50 FT_GlyphDict_GetNameFunc get_name;
51 FT_GlyphDict_NameIndexFunc name_index; /* optional */ 51 FT_GlyphDict_NameIndexFunc name_index; /* optional */
52 }; 52 };
53 53
54
54 #ifndef FT_CONFIG_OPTION_PIC 55 #ifndef FT_CONFIG_OPTION_PIC
55 56
56 #define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \ 57 #define FT_DEFINE_SERVICE_GLYPHDICTREC( class_, \
57 static const FT_Service_GlyphDictRec class_ = \ 58 get_name_, \
59 name_index_) \
60 static const FT_Service_GlyphDictRec class_ = \
58 { \ 61 { \
59 get_name_, name_index_ \ 62 get_name_, name_index_ \
60 }; 63 };
61 64
62 #else /* FT_CONFIG_OPTION_PIC */ 65 #else /* FT_CONFIG_OPTION_PIC */
63 66
64 #define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \ 67 #define FT_DEFINE_SERVICE_GLYPHDICTREC( class_, \
68 get_name_, \
69 name_index_) \
65 void \ 70 void \
66 FT_Init_Class_##class_( FT_Library library, \ 71 FT_Init_Class_ ## class_( FT_Library library, \
67 FT_Service_GlyphDictRec* clazz) \ 72 FT_Service_GlyphDictRec* clazz ) \
68 { \ 73 { \
69 FT_UNUSED(library); \ 74 FT_UNUSED( library ); \
70 clazz->get_name = get_name_; \ 75 \
76 clazz->get_name = get_name_; \
71 clazz->name_index = name_index_; \ 77 clazz->name_index = name_index_; \
72 } 78 }
73 79
74 #endif /* FT_CONFIG_OPTION_PIC */ 80 #endif /* FT_CONFIG_OPTION_PIC */
75 81
76 /* */ 82 /* */
77 83
78 84
79 FT_END_HEADER 85 FT_END_HEADER
80 86
81 87
82 #endif /* __SVGLDICT_H__ */ 88 #endif /* __SVGLDICT_H__ */
OLDNEW
« no previous file with comments | « include/freetype/internal/services/svcid.h ('k') | include/freetype/internal/services/svmm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698