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: src/truetype/ttpic.h

Issue 89753003: Update freetype to latest version of ASOP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src/third_party/freetype.git@master
Patch Set: Created 7 years 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 | « src/truetype/ttobjs.c ('k') | src/truetype/ttpic.c » ('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 /* ttpic.h */ 3 /* ttpic.h */
4 /* */ 4 /* */
5 /* The FreeType position independent code services for truetype module. */ 5 /* The FreeType position independent code services for truetype module. */
6 /* */ 6 /* */
7 /* Copyright 2009 by */ 7 /* Copyright 2009, 2012, 2013 by */
8 /* Oran Agra and Mickey Gabel. */ 8 /* Oran Agra and Mickey Gabel. */
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 __TTPIC_H__ 19 #ifndef __TTPIC_H__
20 #define __TTPIC_H__ 20 #define __TTPIC_H__
21 21
22 22
23 FT_BEGIN_HEADER 23 FT_BEGIN_HEADER
24 24
25 #ifndef FT_CONFIG_OPTION_PIC 25 #ifndef FT_CONFIG_OPTION_PIC
26 #define FT_TT_SERVICES_GET tt_services 26
27 #define FT_TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters 27 #define TT_SERVICES_GET tt_services
28 #define FT_TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf 28 #define TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters
29 #define TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf
30 #define TT_SERVICE_PROPERTIES_GET tt_service_properties
29 31
30 #else /* FT_CONFIG_OPTION_PIC */ 32 #else /* FT_CONFIG_OPTION_PIC */
31 33
32 #include FT_MULTIPLE_MASTERS_H 34 #include FT_MULTIPLE_MASTERS_H
33 #include FT_SERVICE_MULTIPLE_MASTERS_H 35 #include FT_SERVICE_MULTIPLE_MASTERS_H
34 #include FT_SERVICE_TRUETYPE_GLYF_H 36 #include FT_SERVICE_TRUETYPE_GLYF_H
37 #include FT_SERVICE_PROPERTIES_H
35 38
36 typedef struct TTModulePIC_ 39
40 typedef struct TTModulePIC_
37 { 41 {
38 FT_ServiceDescRec* tt_services; 42 FT_ServiceDescRec* tt_services;
39 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT 43 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
40 FT_Service_MultiMastersRec tt_service_gx_multi_masters; 44 FT_Service_MultiMastersRec tt_service_gx_multi_masters;
41 #endif 45 #endif
42 FT_Service_TTGlyfRec tt_service_truetype_glyf; 46 FT_Service_TTGlyfRec tt_service_truetype_glyf;
47 FT_Service_PropertiesRec tt_service_properties;
48
43 } TTModulePIC; 49 } TTModulePIC;
44 50
45 #define GET_PIC(lib) ((TTModulePIC*)((lib)->pic_containe r.truetype)) 51
46 #define FT_TT_SERVICES_GET (GET_PIC(library)->tt_services) 52 #define GET_PIC( lib ) \
47 #define FT_TT_SERVICE_GX_MULTI_MASTERS_GET (GET_PIC(library)->tt_service_gx_mu lti_masters) 53 ( (TTModulePIC*)((lib)->pic_container.truetype) )
48 #define FT_TT_SERVICE_TRUETYPE_GLYF_GET (GET_PIC(library)->tt_service_truet ype_glyf) 54 #define TT_SERVICES_GET \
55 ( GET_PIC( library )->tt_services )
56 #define TT_SERVICE_GX_MULTI_MASTERS_GET \
57 ( GET_PIC( library )->tt_service_gx_multi_masters )
58 #define TT_SERVICE_TRUETYPE_GLYF_GET \
59 ( GET_PIC( library )->tt_service_truetype_glyf )
60 #define TT_SERVICE_PROPERTIES_GET \
61 ( GET_PIC( library )->tt_service_properties )
62
49 63
50 /* see ttpic.c for the implementation */ 64 /* see ttpic.c for the implementation */
51 void 65 void
52 tt_driver_class_pic_free( FT_Library library ); 66 tt_driver_class_pic_free( FT_Library library );
53 67
54 FT_Error 68 FT_Error
55 tt_driver_class_pic_init( FT_Library library ); 69 tt_driver_class_pic_init( FT_Library library );
56 70
57 #endif /* FT_CONFIG_OPTION_PIC */ 71 #endif /* FT_CONFIG_OPTION_PIC */
58 72
59 /* */ 73 /* */
60 74
75
61 FT_END_HEADER 76 FT_END_HEADER
62 77
63 #endif /* __TTPIC_H__ */ 78 #endif /* __TTPIC_H__ */
64 79
65 80
66 /* END */ 81 /* END */
OLDNEW
« no previous file with comments | « src/truetype/ttobjs.c ('k') | src/truetype/ttpic.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698