Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
80b13f57
by Werner Lemberg at 2021-10-26T10:57:17+02:00
3 changed files:
Changes:
... | ... | @@ -1162,8 +1162,8 @@ |
1162 | 1162 |
}
|
1163 | 1163 |
|
1164 | 1164 |
/* read top level fields */
|
1165 |
- if ( FT_READ_ULONG( regionListOffset ) ||
|
|
1166 |
- FT_READ_USHORT( dataCount ) )
|
|
1165 |
+ if ( FT_READ_ULONG( regionListOffset ) ||
|
|
1166 |
+ FT_READ_USHORT( dataCount ) )
|
|
1167 | 1167 |
goto Exit;
|
1168 | 1168 |
|
1169 | 1169 |
/* make temporary copy of item variation data offsets; */
|
... | ... | @@ -837,7 +837,7 @@ |
837 | 837 |
FT_ULong table_pos, table_len;
|
838 | 838 |
FT_ULong storage_start, storage_limit;
|
839 | 839 |
TT_NameTable table;
|
840 |
- TT_Name names = NULL;
|
|
840 |
+ TT_Name names = NULL;
|
|
841 | 841 |
TT_LangTag langTags = NULL;
|
842 | 842 |
|
843 | 843 |
static const FT_Frame_Field name_table_fields[] =
|
... | ... | @@ -947,7 +947,7 @@ |
947 | 947 |
}
|
948 | 948 |
|
949 | 949 |
table->langTags = langTags;
|
950 |
- langTags = NULL;
|
|
950 |
+ langTags = NULL;
|
|
951 | 951 |
}
|
952 | 952 |
|
953 | 953 |
FT_FRAME_EXIT();
|
... | ... | @@ -1008,8 +1008,8 @@ |
1008 | 1008 |
FT_MEM_QRENEW_ARRAY( names,
|
1009 | 1009 |
table->numNameRecords,
|
1010 | 1010 |
valid );
|
1011 |
- table->names = names;
|
|
1012 |
- names = NULL;
|
|
1011 |
+ table->names = names;
|
|
1012 |
+ names = NULL;
|
|
1013 | 1013 |
table->numNameRecords = valid;
|
1014 | 1014 |
}
|
1015 | 1015 |
|
... | ... | @@ -1476,8 +1476,8 @@ |
1476 | 1476 |
}
|
1477 | 1477 |
|
1478 | 1478 |
face->gasp.gaspRanges = gasp_ranges;
|
1479 |
- gasp_ranges = NULL;
|
|
1480 |
- face->gasp.numRanges = num_ranges;
|
|
1479 |
+ gasp_ranges = NULL;
|
|
1480 |
+ face->gasp.numRanges = num_ranges;
|
|
1481 | 1481 |
|
1482 | 1482 |
FT_FRAME_EXIT();
|
1483 | 1483 |
|
... | ... | @@ -117,9 +117,9 @@ |
117 | 117 |
goto Exit;
|
118 | 118 |
|
119 | 119 |
blend->num_default_design_vector = 0;
|
120 |
- blend->weight_vector = NULL;
|
|
121 |
- blend->default_weight_vector = NULL;
|
|
122 |
- blend->design_pos[0] = NULL;
|
|
120 |
+ blend->weight_vector = NULL;
|
|
121 |
+ blend->default_weight_vector = NULL;
|
|
122 |
+ blend->design_pos[0] = NULL;
|
|
123 | 123 |
|
124 | 124 |
face->blend = blend;
|
125 | 125 |
}
|
... | ... | @@ -858,9 +858,9 @@ |
858 | 858 |
T1_TokenRec design_tokens[T1_MAX_MM_DESIGNS];
|
859 | 859 |
FT_Int num_designs;
|
860 | 860 |
FT_Int num_axis = 0; /* make compiler happy */
|
861 |
- T1_Parser parser = &loader->parser;
|
|
862 |
- FT_Memory memory = face->root.memory;
|
|
863 |
- FT_Error error = FT_Err_Ok;
|
|
861 |
+ T1_Parser parser = &loader->parser;
|
|
862 |
+ FT_Memory memory = face->root.memory;
|
|
863 |
+ FT_Error error = FT_Err_Ok;
|
|
864 | 864 |
FT_Fixed* design_pos[T1_MAX_MM_DESIGNS];
|
865 | 865 |
|
866 | 866 |
|
... | ... | @@ -886,7 +886,7 @@ |
886 | 886 |
{
|
887 | 887 |
FT_Byte* old_cursor = parser->root.cursor;
|
888 | 888 |
FT_Byte* old_limit = parser->root.limit;
|
889 |
- FT_Int n,nn;
|
|
889 |
+ FT_Int n, nn;
|
|
890 | 890 |
PS_Blend blend;
|
891 | 891 |
|
892 | 892 |
|
... | ... | @@ -965,7 +965,7 @@ |
965 | 965 |
for ( n = 0; n < num_designs; n++ )
|
966 | 966 |
{
|
967 | 967 |
blend->design_pos[n] = design_pos[n];
|
968 |
- design_pos[n] = NULL;
|
|
968 |
+ design_pos[n] = NULL;
|
|
969 | 969 |
}
|
970 | 970 |
}
|
971 | 971 |
|