minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/sfnt/ttpost.c (load_format_20): Simplify comutations.

This commit is contained in:
Alexei Podtelezhnikov 2023-03-30 09:06:35 -04:00
parent 4679fcb666
commit 0db6997026
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sfnt/ttpost.c
View File

@ -164,7 +164,7 @@
FT_Error error; FT_Error error;
FT_Int num_glyphs; FT_Int num_glyphs;
FT_UShort num_names; FT_UShort num_names = 0;
FT_UShort* glyph_indices = NULL; FT_UShort* glyph_indices = NULL;
FT_Byte** name_strings = NULL; FT_Byte** name_strings = NULL;
@ -186,9 +186,10 @@
goto Exit; goto Exit;
} }
/* load the indices */ /* load the indices and note their maximum */
{ {
FT_Int n; FT_Int n;
FT_UShort idx;
if ( FT_QNEW_ARRAY( glyph_indices, num_glyphs ) || if ( FT_QNEW_ARRAY( glyph_indices, num_glyphs ) ||
@ -196,32 +197,18 @@
goto Fail; goto Fail;
for ( n = 0; n < num_glyphs; n++ ) for ( n = 0; n < num_glyphs; n++ )
glyph_indices[n] = FT_GET_USHORT(); {
glyph_indices[n] = idx = FT_GET_USHORT();
if ( idx > num_names )
num_names = idx;
}
FT_FRAME_EXIT(); FT_FRAME_EXIT();
} }
/* compute number of names stored in table */ /* compute number of names stored in table */
{ num_names = num_names > 257 ? num_names - 257 : 0;
FT_Int n;
num_names = 0;
for ( n = 0; n < num_glyphs; n++ )
{
FT_Int idx;
idx = glyph_indices[n];
if ( idx >= 258 )
{
idx -= 257;
if ( idx > num_names )
num_names = (FT_UShort)idx;
}
}
}
/* now load the name strings */ /* now load the name strings */
if ( num_names ) if ( num_names )