... |
... |
@@ -2127,12 +2127,11 @@ |
2127
|
2127
|
compute_glyph_metrics( TT_Loader loader,
|
2128
|
2128
|
FT_UInt glyph_index )
|
2129
|
2129
|
{
|
2130
|
|
- TT_Face face = loader->face;
|
2131
|
|
-
|
|
2130
|
+ TT_Face face = loader->face;
|
|
2131
|
+ TT_Size size = loader->size;
|
|
2132
|
+ TT_GlyphSlot glyph = loader->glyph;
|
2132
|
2133
|
FT_BBox bbox;
|
2133
|
2134
|
FT_Fixed y_scale;
|
2134
|
|
- TT_GlyphSlot glyph = loader->glyph;
|
2135
|
|
- TT_Size size = loader->size;
|
2136
|
2135
|
|
2137
|
2136
|
|
2138
|
2137
|
y_scale = 0x10000L;
|
... |
... |
@@ -2270,17 +2269,13 @@ |
2270
|
2269
|
FT_UInt glyph_index,
|
2271
|
2270
|
FT_Int32 load_flags )
|
2272
|
2271
|
{
|
2273
|
|
- TT_Face face;
|
2274
|
|
- SFNT_Service sfnt;
|
2275
|
|
- FT_Stream stream;
|
|
2272
|
+ TT_Face face = (TT_Face)glyph->face;
|
|
2273
|
+ SFNT_Service sfnt = (SFNT_Service)face->sfnt;
|
|
2274
|
+ FT_Stream stream = face->root.stream;
|
2276
|
2275
|
FT_Error error;
|
2277
|
2276
|
TT_SBit_MetricsRec sbit_metrics;
|
2278
|
2277
|
|
2279
|
2278
|
|
2280
|
|
- face = (TT_Face)glyph->face;
|
2281
|
|
- sfnt = (SFNT_Service)face->sfnt;
|
2282
|
|
- stream = face->root.stream;
|
2283
|
|
-
|
2284
|
2279
|
error = sfnt->load_sbit_image( face,
|
2285
|
2280
|
size->strike_index,
|
2286
|
2281
|
glyph_index,
|
... |
... |
@@ -2331,22 +2326,19 @@ |
2331
|
2326
|
FT_Int32 load_flags,
|
2332
|
2327
|
FT_Bool glyf_table_only )
|
2333
|
2328
|
{
|
2334
|
|
- TT_Face face;
|
2335
|
|
- FT_Stream stream;
|
|
2329
|
+ TT_Face face = (TT_Face)glyph->face;
|
|
2330
|
+ FT_Stream stream = face->root.stream;
|
2336
|
2331
|
|
2337
|
2332
|
#ifdef TT_USE_BYTECODE_INTERPRETER
|
2338
|
2333
|
FT_Error error;
|
2339
|
2334
|
FT_Bool pedantic = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
|
2340
|
2335
|
#if defined TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY || \
|
2341
|
2336
|
defined TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|
2342
|
|
- TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( (TT_Face)glyph->face );
|
|
2337
|
+ TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( glyph->face );
|
2343
|
2338
|
#endif
|
2344
|
2339
|
#endif
|
2345
|
2340
|
|
2346
|
2341
|
|
2347
|
|
- face = (TT_Face)glyph->face;
|
2348
|
|
- stream = face->root.stream;
|
2349
|
|
-
|
2350
|
2342
|
FT_ZERO( loader );
|
2351
|
2343
|
|
2352
|
2344
|
#ifdef TT_USE_BYTECODE_INTERPRETER
|
... |
... |
@@ -2714,6 +2706,7 @@ |
2714
|
2706
|
FT_UInt glyph_index,
|
2715
|
2707
|
FT_Int32 load_flags )
|
2716
|
2708
|
{
|
|
2709
|
+ TT_Face face = (TT_Face)glyph->face;
|
2717
|
2710
|
FT_Error error;
|
2718
|
2711
|
TT_LoaderRec loader;
|
2719
|
2712
|
|
... |
... |
@@ -2738,8 +2731,6 @@ |
2738
|
2731
|
/* if we have a bitmap-only font, return an empty glyph */
|
2739
|
2732
|
if ( !FT_IS_SCALABLE( glyph->face ) )
|
2740
|
2733
|
{
|
2741
|
|
- TT_Face face = (TT_Face)glyph->face;
|
2742
|
|
-
|
2743
|
2734
|
FT_Short left_bearing = 0;
|
2744
|
2735
|
FT_Short top_bearing = 0;
|
2745
|
2736
|
|
... |
... |
@@ -2798,9 +2789,6 @@ |
2798
|
2789
|
if ( FT_IS_SCALABLE( glyph->face ) ||
|
2799
|
2790
|
FT_HAS_SBIX( glyph->face ) )
|
2800
|
2791
|
{
|
2801
|
|
- TT_Face face = (TT_Face)glyph->face;
|
2802
|
|
-
|
2803
|
|
-
|
2804
|
2792
|
/* for the bbox we need the header only */
|
2805
|
2793
|
(void)tt_loader_init( &loader, size, glyph, load_flags, TRUE );
|
2806
|
2794
|
(void)load_truetype_glyph( &loader, glyph_index, 0, TRUE );
|
... |
... |
@@ -2869,9 +2857,8 @@ |
2869
|
2857
|
#ifdef FT_CONFIG_OPTION_SVG
|
2870
|
2858
|
|
2871
|
2859
|
/* check for OT-SVG */
|
2872
|
|
- if ( ( load_flags & FT_LOAD_COLOR ) && ( (TT_Face)glyph->face )->svg )
|
|
2860
|
+ if ( ( load_flags & FT_LOAD_COLOR ) && face->svg )
|
2873
|
2861
|
{
|
2874
|
|
- TT_Face face = (TT_Face)glyph->face;
|
2875
|
2862
|
SFNT_Service sfnt = (SFNT_Service)face->sfnt;
|
2876
|
2863
|
|
2877
|
2864
|
|