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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: include/freetype/internal/services/svpscmap.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/svpostnm.h ('k') | include/freetype/internal/services/svpsinfo.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 /* svpscmap.h */ 3 /* svpscmap.h */
4 /* */ 4 /* */
5 /* The FreeType PostScript charmap service (specification). */ 5 /* The FreeType PostScript charmap service (specification). */
6 /* */ 6 /* */
7 /* Copyright 2003, 2006 by */ 7 /* Copyright 2003, 2006, 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 PS_Macintosh_NameFunc macintosh_name; 114 PS_Macintosh_NameFunc macintosh_name;
115 PS_Adobe_Std_StringsFunc adobe_std_strings; 115 PS_Adobe_Std_StringsFunc adobe_std_strings;
116 const unsigned short* adobe_std_encoding; 116 const unsigned short* adobe_std_encoding;
117 const unsigned short* adobe_expert_encoding; 117 const unsigned short* adobe_expert_encoding;
118 }; 118 };
119 119
120 120
121 #ifndef FT_CONFIG_OPTION_PIC 121 #ifndef FT_CONFIG_OPTION_PIC
122 122
123 #define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \ 123 #define FT_DEFINE_SERVICE_PSCMAPSREC( class_, \
124 unicodes_char_index_, unicodes_char_next_, macintosh_name_, \ 124 unicode_value_, \
125 adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_) \ 125 unicodes_init_, \
126 static const FT_Service_PsCMapsRec class_ = \ 126 unicodes_char_index_, \
127 { \ 127 unicodes_char_next_, \
128 unicode_value_, unicodes_init_, \ 128 macintosh_name_, \
129 unicodes_char_index_, unicodes_char_next_, macintosh_name_, \ 129 adobe_std_strings_, \
130 adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_ \ 130 adobe_std_encoding_, \
131 adobe_expert_encoding_ ) \
132 static const FT_Service_PsCMapsRec class_ = \
133 { \
134 unicode_value_, unicodes_init_, \
135 unicodes_char_index_, unicodes_char_next_, macintosh_name_, \
136 adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_ \
131 }; 137 };
132 138
133 #else /* FT_CONFIG_OPTION_PIC */ 139 #else /* FT_CONFIG_OPTION_PIC */
134 140
135 #define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \ 141 #define FT_DEFINE_SERVICE_PSCMAPSREC( class_, \
136 unicodes_char_index_, unicodes_char_next_, macintosh_name_, \ 142 unicode_value_, \
137 adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_) \ 143 unicodes_init_, \
138 void \ 144 unicodes_char_index_, \
139 FT_Init_Class_##class_( FT_Library library, \ 145 unicodes_char_next_, \
140 FT_Service_PsCMapsRec* clazz) \ 146 macintosh_name_, \
141 { \ 147 adobe_std_strings_, \
142 FT_UNUSED(library); \ 148 adobe_std_encoding_, \
143 clazz->unicode_value = unicode_value_; \ 149 adobe_expert_encoding_ ) \
144 clazz->unicodes_init = unicodes_init_; \ 150 void \
145 clazz->unicodes_char_index = unicodes_char_index_; \ 151 FT_Init_Class_ ## class_( FT_Library library, \
146 clazz->unicodes_char_next = unicodes_char_next_; \ 152 FT_Service_PsCMapsRec* clazz ) \
147 clazz->macintosh_name = macintosh_name_; \ 153 { \
148 clazz->adobe_std_strings = adobe_std_strings_; \ 154 FT_UNUSED( library ); \
149 clazz->adobe_std_encoding = adobe_std_encoding_; \ 155 \
150 clazz->adobe_expert_encoding = adobe_expert_encoding_; \ 156 clazz->unicode_value = unicode_value_; \
151 } 157 clazz->unicodes_init = unicodes_init_; \
158 clazz->unicodes_char_index = unicodes_char_index_; \
159 clazz->unicodes_char_next = unicodes_char_next_; \
160 clazz->macintosh_name = macintosh_name_; \
161 clazz->adobe_std_strings = adobe_std_strings_; \
162 clazz->adobe_std_encoding = adobe_std_encoding_; \
163 clazz->adobe_expert_encoding = adobe_expert_encoding_; \
164 }
152 165
153 #endif /* FT_CONFIG_OPTION_PIC */ 166 #endif /* FT_CONFIG_OPTION_PIC */
154 167
155 /* */ 168 /* */
156 169
157 170
158 FT_END_HEADER 171 FT_END_HEADER
159 172
160 173
161 #endif /* __SVPSCMAP_H__ */ 174 #endif /* __SVPSCMAP_H__ */
162 175
163 176
164 /* END */ 177 /* END */
OLDNEW
« no previous file with comments | « include/freetype/internal/services/svpostnm.h ('k') | include/freetype/internal/services/svpsinfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698