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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: include/freetype/internal/services/svcid.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/svbdf.h ('k') | include/freetype/internal/services/svgldict.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 /* svcid.h */ 3 /* svcid.h */
4 /* */ 4 /* */
5 /* The FreeType CID font services (specification). */ 5 /* The FreeType CID font services (specification). */
6 /* */ 6 /* */
7 /* Copyright 2007, 2009 by Derek Clegg, Michael Toftdal. */ 7 /* Copyright 2007, 2009, 2012 by Derek Clegg, Michael Toftdal. */
8 /* */ 8 /* */
9 /* This file is part of the FreeType project, and may only be used, */ 9 /* This file is part of the FreeType project, and may only be used, */
10 /* modified, and distributed under the terms of the FreeType project */ 10 /* modified, and distributed under the terms of the FreeType project */
11 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */ 11 /* license, LICENSE.TXT. By continuing to use, modify, or distribute */
12 /* this file you indicate that you have read the license and */ 12 /* this file you indicate that you have read the license and */
13 /* understand and accept it fully. */ 13 /* understand and accept it fully. */
14 /* */ 14 /* */
15 /***************************************************************************/ 15 /***************************************************************************/
16 16
17 17
(...skipping 21 matching lines...) Expand all
39 FT_UInt glyph_index, 39 FT_UInt glyph_index,
40 FT_UInt *cid ); 40 FT_UInt *cid );
41 41
42 FT_DEFINE_SERVICE( CID ) 42 FT_DEFINE_SERVICE( CID )
43 { 43 {
44 FT_CID_GetRegistryOrderingSupplementFunc get_ros; 44 FT_CID_GetRegistryOrderingSupplementFunc get_ros;
45 FT_CID_GetIsInternallyCIDKeyedFunc get_is_cid; 45 FT_CID_GetIsInternallyCIDKeyedFunc get_is_cid;
46 FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index; 46 FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index;
47 }; 47 };
48 48
49
49 #ifndef FT_CONFIG_OPTION_PIC 50 #ifndef FT_CONFIG_OPTION_PIC
50 51
51 #define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \ 52 #define FT_DEFINE_SERVICE_CIDREC( class_, \
52 get_is_cid_, get_cid_from_glyph_index_ ) \ 53 get_ros_, \
53 static const FT_Service_CIDRec class_ = \ 54 get_is_cid_, \
54 { \ 55 get_cid_from_glyph_index_ ) \
55 get_ros_, get_is_cid_, get_cid_from_glyph_index_ \ 56 static const FT_Service_CIDRec class_ = \
57 { \
58 get_ros_, get_is_cid_, get_cid_from_glyph_index_ \
56 }; 59 };
57 60
58 #else /* FT_CONFIG_OPTION_PIC */ 61 #else /* FT_CONFIG_OPTION_PIC */
59 62
60 #define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \ 63 #define FT_DEFINE_SERVICE_CIDREC( class_, \
61 get_is_cid_, get_cid_from_glyph_index_ ) \ 64 get_ros_, \
62 void \ 65 get_is_cid_, \
63 FT_Init_Class_##class_( FT_Library library, \ 66 get_cid_from_glyph_index_ ) \
64 FT_Service_CIDRec* clazz) \ 67 void \
65 { \ 68 FT_Init_Class_ ## class_( FT_Library library, \
66 FT_UNUSED(library); \ 69 FT_Service_CIDRec* clazz ) \
67 clazz->get_ros = get_ros_; \ 70 { \
68 clazz->get_is_cid = get_is_cid_; \ 71 FT_UNUSED( library ); \
69 clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \ 72 \
70 } 73 clazz->get_ros = get_ros_; \
74 clazz->get_is_cid = get_is_cid_; \
75 clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \
76 }
71 77
72 #endif /* FT_CONFIG_OPTION_PIC */ 78 #endif /* FT_CONFIG_OPTION_PIC */
73 79
74 /* */ 80 /* */
75 81
76 82
77 FT_END_HEADER 83 FT_END_HEADER
78 84
79 85
80 #endif /* __SVCID_H__ */ 86 #endif /* __SVCID_H__ */
81 87
82 88
83 /* END */ 89 /* END */
OLDNEW
« no previous file with comments | « include/freetype/internal/services/svbdf.h ('k') | include/freetype/internal/services/svgldict.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698