Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
bacc48e6
by Werner Lemberg at 2023-01-28T17:04:11+01:00
-
e97544a7
by Werner Lemberg at 2023-01-28T17:04:38+01:00
10 changed files:
- builds/unix/freetype2.m4
- docs/CHANGES
- src/base/ftbitmap.c
- src/base/ftsynth.c
- src/pcf/pcfdrivr.c
- src/pcf/pcfutil.c
- src/pfr/pfrobjs.c
- src/sfnt/ttcolr.c
- src/truetype/ttgload.c
- src/truetype/ttgxvar.c
Changes:
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | # generated by Autoconf, under the same distribution terms as the rest of
|
16 | 16 | # that program.
|
17 | 17 | #
|
18 | -# serial 6
|
|
18 | +# serial 7
|
|
19 | 19 | |
20 | 20 | # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
21 | 21 | # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
|
... | ... | @@ -7,6 +7,8 @@ CHANGES BETWEEN 2.12.1 and 2.13 |
7 | 7 | graphical FreeType demo programs into a single application based
|
8 | 8 | on the Qt framework. This was Charlie Jiang's GSoC 2022 project.
|
9 | 9 | |
10 | + - The 'COLR' v1 API is now considered as stable.
|
|
11 | + |
|
10 | 12 | |
11 | 13 | III. MISCELLANEOUS
|
12 | 14 | |
... | ... | @@ -18,7 +20,8 @@ CHANGES BETWEEN 2.12.1 and 2.13 |
18 | 20 | |
19 | 21 | https://github.com/harfbuzz/boring-expansion-spec/blob/main/avar2.md
|
20 | 22 | |
21 | - for the specification.
|
|
23 | + for the specification. To deactivate it, define the configuration
|
|
24 | + macro 'TT_CONFIG_OPTION_NO_BORING_EXPANSION'.
|
|
22 | 25 | |
23 | 26 | - A new API `FT_GlyphSlot_Slant` to slant a glyph by a given angle
|
24 | 27 | has been added. Note that this function is part of `ftsynth.h`,
|
... | ... | @@ -519,8 +519,8 @@ |
519 | 519 | case FT_PIXEL_MODE_BGRA:
|
520 | 520 | {
|
521 | 521 | FT_Int width = (FT_Int)source->width;
|
522 | - FT_Int neg = ( target->pitch == 0 && source->pitch < 0 ) ||
|
|
523 | - target->pitch < 0;
|
|
522 | + FT_Int neg = ( target->pitch == 0 && source->pitch < 0 ) ||
|
|
523 | + target->pitch < 0;
|
|
524 | 524 | |
525 | 525 | |
526 | 526 | FT_Bitmap_Done( library, target );
|
... | ... | @@ -46,6 +46,7 @@ |
46 | 46 | FT_EXPORT_DEF( void )
|
47 | 47 | FT_GlyphSlot_Oblique( FT_GlyphSlot slot )
|
48 | 48 | {
|
49 | + /* Value '0x0366A' corresponds to a shear angle of about 12 degrees. */
|
|
49 | 50 | FT_GlyphSlot_Slant( slot, 0x0366A );
|
50 | 51 | }
|
51 | 52 |
... | ... | @@ -104,7 +104,8 @@ THE SOFTWARE. |
104 | 104 | pcf_cmap_char_index( FT_CMap pcfcmap, /* PCF_CMap */
|
105 | 105 | FT_UInt32 charcode )
|
106 | 106 | {
|
107 | - PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
|
|
107 | + PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
|
|
108 | + |
|
108 | 109 | FT_UInt32 i = ( charcode >> 8 ) - enc->firstRow;
|
109 | 110 | FT_UInt32 j = ( charcode & 0xFF ) - enc->firstCol;
|
110 | 111 | FT_UInt32 h = enc->lastRow - enc->firstRow + 1;
|
... | ... | @@ -125,11 +126,13 @@ THE SOFTWARE. |
125 | 126 | {
|
126 | 127 | PCF_Enc enc = ( (PCF_CMap)pcfcmap )->enc;
|
127 | 128 | FT_UInt32 charcode = *acharcode + 1;
|
129 | + |
|
128 | 130 | FT_UInt32 i = ( charcode >> 8 ) - enc->firstRow;
|
129 | 131 | FT_UInt32 j = ( charcode & 0xFF ) - enc->firstCol;
|
130 | 132 | FT_UInt32 h = enc->lastRow - enc->firstRow + 1;
|
131 | 133 | FT_UInt32 w = enc->lastCol - enc->firstCol + 1;
|
132 | - FT_UInt result = 0;
|
|
134 | + |
|
135 | + FT_UInt result = 0;
|
|
133 | 136 | |
134 | 137 | |
135 | 138 | /* adjust wrapped around "negative" values */
|
... | ... | @@ -57,8 +57,9 @@ in this Software without prior written authorization from The Open Group. |
57 | 57 | }
|
58 | 58 | |
59 | 59 | |
60 | -#if defined( __clang__ ) || ( defined( __GNUC__ ) && \
|
|
61 | - ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )
|
|
60 | +#if defined( __clang__ ) || \
|
|
61 | + ( defined( __GNUC__ ) && \
|
|
62 | + ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )
|
|
62 | 63 | |
63 | 64 | #define BSWAP16( x ) __builtin_bswap16( x )
|
64 | 65 | #define BSWAP32( x ) __builtin_bswap32( x )
|
... | ... | @@ -490,7 +490,7 @@ |
490 | 490 | glyph1--;
|
491 | 491 | glyph2--;
|
492 | 492 | |
493 | - /* check the array bounds, .notdef is automacally out */
|
|
493 | + /* check the array bounds, .notdef is automatically out */
|
|
494 | 494 | if ( glyph1 >= phy_font->num_chars ||
|
495 | 495 | glyph2 >= phy_font->num_chars )
|
496 | 496 | goto Exit;
|
... | ... | @@ -66,25 +66,25 @@ |
66 | 66 | |
67 | 67 | typedef enum FT_PaintFormat_Internal_
|
68 | 68 | {
|
69 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID = 3,
|
|
70 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT = 5,
|
|
71 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT = 7,
|
|
72 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT = 9,
|
|
73 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSFORM = 13,
|
|
74 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSLATE = 15,
|
|
75 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE = 17,
|
|
76 | - FT_COLR_PAINTFORMAT_INTERNAL_SCALE_CENTER = 18,
|
|
77 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER = 19,
|
|
78 | - FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM = 20,
|
|
79 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM = 21,
|
|
80 | - FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM_CENTER = 22,
|
|
81 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER = 23,
|
|
82 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE = 25,
|
|
83 | - FT_COLR_PAINTFORMAT_INTERNAL_ROTATE_CENTER = 26,
|
|
84 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER = 27,
|
|
85 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW = 29,
|
|
86 | - FT_COLR_PAINTFORMAT_INTERNAL_SKEW_CENTER = 30,
|
|
87 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER = 31,
|
|
69 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID = 3,
|
|
70 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT = 5,
|
|
71 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT = 7,
|
|
72 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT = 9,
|
|
73 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSFORM = 13,
|
|
74 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_TRANSLATE = 15,
|
|
75 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE = 17,
|
|
76 | + FT_COLR_PAINTFORMAT_INTERNAL_SCALE_CENTER = 18,
|
|
77 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER = 19,
|
|
78 | + FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM = 20,
|
|
79 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM = 21,
|
|
80 | + FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM_CENTER = 22,
|
|
81 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER = 23,
|
|
82 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE = 25,
|
|
83 | + FT_COLR_PAINTFORMAT_INTERNAL_ROTATE_CENTER = 26,
|
|
84 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER = 27,
|
|
85 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW = 29,
|
|
86 | + FT_COLR_PAINTFORMAT_INTERNAL_SKEW_CENTER = 30,
|
|
87 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER = 31,
|
|
88 | 88 | |
89 | 89 | } FT_PaintFormat_Internal;
|
90 | 90 | |
... | ... | @@ -177,6 +177,7 @@ |
177 | 177 | FT_ULong colr_offset_in_stream;
|
178 | 178 | #endif
|
179 | 179 | |
180 | + |
|
180 | 181 | /* `COLR' always needs `CPAL' */
|
181 | 182 | if ( !face->cpal )
|
182 | 183 | return FT_THROW( Invalid_File_Format );
|
... | ... | @@ -334,11 +335,11 @@ |
334 | 335 | if ( colr->var_store.axisCount && var_idx_map_offset )
|
335 | 336 | {
|
336 | 337 | error = mm->load_delta_set_idx_map(
|
337 | - FT_FACE( face ),
|
|
338 | - colr_offset_in_stream + var_idx_map_offset,
|
|
339 | - &colr->delta_set_idx_map,
|
|
340 | - &colr->var_store,
|
|
341 | - table_size );
|
|
338 | + FT_FACE( face ),
|
|
339 | + colr_offset_in_stream + var_idx_map_offset,
|
|
340 | + &colr->delta_set_idx_map,
|
|
341 | + &colr->var_store,
|
|
342 | + table_size );
|
|
342 | 343 | if ( error != FT_Err_Ok )
|
343 | 344 | goto InvalidTable;
|
344 | 345 | }
|
... | ... | @@ -681,7 +682,7 @@ |
681 | 682 | |
682 | 683 | else if ( apaint->format == FT_COLR_PAINTFORMAT_SOLID ||
|
683 | 684 | (FT_PaintFormat_Internal)apaint->format ==
|
684 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
|
|
685 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
|
|
685 | 686 | {
|
686 | 687 | ENSURE_READ_BYTES( 4 );
|
687 | 688 | apaint->u.solid.color.palette_index = FT_NEXT_USHORT( p );
|
... | ... | @@ -689,7 +690,7 @@ |
689 | 690 | |
690 | 691 | #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
691 | 692 | if ( (FT_PaintFormat_Internal)apaint->format ==
|
692 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
|
|
693 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SOLID )
|
|
693 | 694 | {
|
694 | 695 | ENSURE_READ_BYTES( 4 );
|
695 | 696 | var_index_base = FT_NEXT_ULONG( p );
|
... | ... | @@ -725,10 +726,10 @@ |
725 | 726 | if ( !get_child_table_pointer( colr, paint_base, &p, &child_table_p ) )
|
726 | 727 | return 0;
|
727 | 728 | |
728 | - if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT ||
|
|
729 | + if ( apaint->format == FT_COLR_PAINTFORMAT_LINEAR_GRADIENT ||
|
|
729 | 730 | ( do_read_var =
|
730 | - ( (FT_PaintFormat_Internal)apaint->format ==
|
|
731 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT ) ) )
|
|
731 | + ( (FT_PaintFormat_Internal)apaint->format ==
|
|
732 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_LINEAR_GRADIENT ) ) )
|
|
732 | 733 | {
|
733 | 734 | if ( !read_color_line( colr,
|
734 | 735 | child_table_p,
|
... | ... | @@ -773,10 +774,10 @@ |
773 | 774 | return 1;
|
774 | 775 | }
|
775 | 776 | |
776 | - else if ( apaint->format == FT_COLR_PAINTFORMAT_RADIAL_GRADIENT ||
|
|
777 | + else if ( apaint->format == FT_COLR_PAINTFORMAT_RADIAL_GRADIENT ||
|
|
777 | 778 | ( do_read_var =
|
778 | - ( (FT_PaintFormat_Internal)apaint->format ==
|
|
779 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT ) ) )
|
|
779 | + ( (FT_PaintFormat_Internal)apaint->format ==
|
|
780 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_RADIAL_GRADIENT ) ) )
|
|
780 | 781 | {
|
781 | 782 | FT_Pos tmp;
|
782 | 783 | |
... | ... | @@ -835,10 +836,10 @@ |
835 | 836 | return 1;
|
836 | 837 | }
|
837 | 838 | |
838 | - else if ( apaint->format == FT_COLR_PAINTFORMAT_SWEEP_GRADIENT ||
|
|
839 | + else if ( apaint->format == FT_COLR_PAINTFORMAT_SWEEP_GRADIENT ||
|
|
839 | 840 | ( do_read_var =
|
840 | - ( (FT_PaintFormat_Internal)apaint->format ==
|
|
841 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT ) ) )
|
|
841 | + ( (FT_PaintFormat_Internal)apaint->format ==
|
|
842 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SWEEP_GRADIENT ) ) )
|
|
842 | 843 | {
|
843 | 844 | if ( !read_color_line( colr,
|
844 | 845 | child_table_p,
|
... | ... | @@ -1024,14 +1025,14 @@ |
1024 | 1025 | /* Base values set, now handle variations. */
|
1025 | 1026 | |
1026 | 1027 | #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
1027 | - if ( ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1028 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE ||
|
|
1029 | - (FT_PaintFormat_Internal)apaint->format ==
|
|
1030 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER ||
|
|
1031 | - (FT_PaintFormat_Internal)apaint->format ==
|
|
1032 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM ||
|
|
1033 | - (FT_PaintFormat_Internal)apaint->format ==
|
|
1034 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER ) )
|
|
1028 | + if ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1029 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE ||
|
|
1030 | + (FT_PaintFormat_Internal)apaint->format ==
|
|
1031 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_CENTER ||
|
|
1032 | + (FT_PaintFormat_Internal)apaint->format ==
|
|
1033 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM ||
|
|
1034 | + (FT_PaintFormat_Internal)apaint->format ==
|
|
1035 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SCALE_UNIFORM_CENTER )
|
|
1035 | 1036 | {
|
1036 | 1037 | ENSURE_READ_BYTES( 4 );
|
1037 | 1038 | var_index_base = FT_NEXT_ULONG( p );
|
... | ... | @@ -1123,10 +1124,10 @@ |
1123 | 1124 | }
|
1124 | 1125 | |
1125 | 1126 | #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
1126 | - if ( ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1127 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE ||
|
|
1128 | - (FT_PaintFormat_Internal)apaint->format ==
|
|
1129 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER ) )
|
|
1127 | + if ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1128 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE ||
|
|
1129 | + (FT_PaintFormat_Internal)apaint->format ==
|
|
1130 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_ROTATE_CENTER )
|
|
1130 | 1131 | {
|
1131 | 1132 | FT_UInt num_deltas = 0;
|
1132 | 1133 | |
... | ... | @@ -1196,10 +1197,10 @@ |
1196 | 1197 | |
1197 | 1198 | |
1198 | 1199 | #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
|
1199 | - if ( ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1200 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW ||
|
|
1201 | - (FT_PaintFormat_Internal)apaint->format ==
|
|
1202 | - FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER ) )
|
|
1200 | + if ( (FT_PaintFormat_Internal)apaint->format ==
|
|
1201 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW ||
|
|
1202 | + (FT_PaintFormat_Internal)apaint->format ==
|
|
1203 | + FT_COLR_PAINTFORMAT_INTERNAL_VAR_SKEW_CENTER )
|
|
1203 | 1204 | {
|
1204 | 1205 | ENSURE_READ_BYTES( 4 );
|
1205 | 1206 | var_index_base = FT_NEXT_ULONG( p );
|
... | ... | @@ -1451,7 +1452,7 @@ |
1451 | 1452 | FT_ItemVarDelta item_deltas[4] = { 0, 0, 0, 0 };
|
1452 | 1453 | |
1453 | 1454 | |
1454 | - /* Check whether we can extract a 32-bit VarIdxBase now. */
|
|
1455 | + /* Check whether we can extract a 32-bit varIndexBase now. */
|
|
1455 | 1456 | if ( p1 > limit - 4 )
|
1456 | 1457 | return 0;
|
1457 | 1458 | |
... | ... | @@ -1462,13 +1463,13 @@ |
1462 | 1463 | return 0;
|
1463 | 1464 | |
1464 | 1465 | font_clip_box.xMin +=
|
1465 | - FT_MulFix( item_deltas[0], face->root.size->metrics.x_scale );
|
|
1466 | + FT_MulFix( item_deltas[0], face->root.size->metrics.x_scale );
|
|
1466 | 1467 | font_clip_box.yMin +=
|
1467 | - FT_MulFix( item_deltas[1], face->root.size->metrics.y_scale );
|
|
1468 | + FT_MulFix( item_deltas[1], face->root.size->metrics.y_scale );
|
|
1468 | 1469 | font_clip_box.xMax +=
|
1469 | - FT_MulFix( item_deltas[2], face->root.size->metrics.x_scale );
|
|
1470 | + FT_MulFix( item_deltas[2], face->root.size->metrics.x_scale );
|
|
1470 | 1471 | font_clip_box.yMax +=
|
1471 | - FT_MulFix( item_deltas[3], face->root.size->metrics.y_scale );
|
|
1472 | + FT_MulFix( item_deltas[3], face->root.size->metrics.y_scale );
|
|
1472 | 1473 | }
|
1473 | 1474 | #endif
|
1474 | 1475 | |
... | ... | @@ -1558,8 +1559,8 @@ |
1558 | 1559 | * Before reading, ensure that `p` is within 'COLR' v1 and we can read a
|
1559 | 1560 | * 4-byte ULONG.
|
1560 | 1561 | */
|
1561 | - if ( p < colr->layers_v1 ||
|
|
1562 | - p > ( (FT_Byte*)colr->table + colr->table_size - 4 ) )
|
|
1562 | + if ( p < colr->layers_v1 ||
|
|
1563 | + p > (FT_Byte*)colr->table + colr->table_size - 4 )
|
|
1563 | 1564 | return 0;
|
1564 | 1565 | |
1565 | 1566 | paint_offset =
|
... | ... | @@ -2269,8 +2269,8 @@ |
2269 | 2269 | FT_UInt glyph_index,
|
2270 | 2270 | FT_Int32 load_flags )
|
2271 | 2271 | {
|
2272 | - TT_Face face = (TT_Face)glyph->face;
|
|
2273 | - SFNT_Service sfnt = (SFNT_Service)face->sfnt;
|
|
2272 | + TT_Face face = (TT_Face)glyph->face;
|
|
2273 | + SFNT_Service sfnt = (SFNT_Service)face->sfnt;
|
|
2274 | 2274 | FT_Stream stream = face->root.stream;
|
2275 | 2275 | FT_Error error;
|
2276 | 2276 | TT_SBit_MetricsRec sbit_metrics;
|
... | ... | @@ -2326,7 +2326,7 @@ |
2326 | 2326 | FT_Int32 load_flags,
|
2327 | 2327 | FT_Bool glyf_table_only )
|
2328 | 2328 | {
|
2329 | - TT_Face face = (TT_Face)glyph->face;
|
|
2329 | + TT_Face face = (TT_Face)glyph->face;
|
|
2330 | 2330 | FT_Stream stream = face->root.stream;
|
2331 | 2331 | |
2332 | 2332 | #ifdef TT_USE_BYTECODE_INTERPRETER
|
... | ... | @@ -2334,7 +2334,7 @@ |
2334 | 2334 | FT_Bool pedantic = FT_BOOL( load_flags & FT_LOAD_PEDANTIC );
|
2335 | 2335 | #if defined TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY || \
|
2336 | 2336 | defined TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
|
2337 | - TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( glyph->face );
|
|
2337 | + TT_Driver driver = (TT_Driver)FT_FACE_DRIVER( glyph->face );
|
|
2338 | 2338 | #endif
|
2339 | 2339 | #endif
|
2340 | 2340 |
... | ... | @@ -3994,11 +3994,11 @@ |
3994 | 3994 | FT_Vector* unrounded )
|
3995 | 3995 | {
|
3996 | 3996 | FT_Error error;
|
3997 | - TT_Face face = loader->face;
|
|
3998 | - FT_Stream stream = face->root.stream;
|
|
3999 | - FT_Memory memory = stream->memory;
|
|
3997 | + TT_Face face = loader->face;
|
|
3998 | + FT_Stream stream = face->root.stream;
|
|
3999 | + FT_Memory memory = stream->memory;
|
|
4000 | 4000 | FT_UInt glyph_index = loader->glyph_index;
|
4001 | - FT_UInt n_points = (FT_UInt)outline->n_points + 4;
|
|
4001 | + FT_UInt n_points = (FT_UInt)outline->n_points + 4;
|
|
4002 | 4002 | |
4003 | 4003 | FT_Vector* points_org = NULL; /* coordinates in 16.16 format */
|
4004 | 4004 | FT_Vector* points_out = NULL; /* coordinates in 16.16 format */
|