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

[truetype] Clean up glyph loading. 

* src/truetype/ttgload.c (TT_Load_Simple_Glyph): Clean space checking.
(TT_Hint_Glyph): Don't copy the outline structure.
(TT_Process_Simple_Glyph): Cosmetic update.
This commit is contained in:
Alexei Podtelezhnikov 2023-03-15 23:18:18 -04:00
parent e71647621c
commit 764bc8e41c
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/truetype/ttgload.c
View File

@ -372,7 +372,6 @@
FT_Vector *vec, *vec_limit;
FT_Pos x, y;
FT_Short *cont, *cont_limit, last;
FT_Int xy_size = 0;
/* check that we can add the contours to the glyph */
@ -408,11 +407,19 @@
if ( error )
goto Fail;
/* stace checked above */
/* space checked above */
n_ins = FT_NEXT_USHORT( p );
FT_TRACE5(( " Instructions size: %u\n", n_ins ));
/* check instructions size */
if ( p + n_ins > limit )
{
FT_TRACE1(( "TT_Load_Simple_Glyph: excessive instruction count\n" ));
error = FT_THROW( Too_Many_Hints );
goto Fail;
}
#ifdef TT_USE_BYTECODE_INTERPRETER
if ( IS_HINTED( load->load_flags ) )
@ -421,14 +428,6 @@
FT_Memory memory = exec->memory;
/* check instructions size */
if ( ( limit - p ) < n_ins )
{
FT_TRACE1(( "TT_Load_Simple_Glyph: instruction count mismatch\n" ));
error = FT_THROW( Too_Many_Hints );
goto Fail;
}
if ( exec->glyphSize )
FT_FREE( exec->glyphIns );
exec->glyphSize = 0;
@ -487,9 +486,6 @@
flag = (FT_Byte*)outline->tags;
x = 0;
if ( p + xy_size > limit )
goto Invalid_Outline;
for ( ; vec < vec_limit; vec++, flag++ )
{
FT_Pos delta = 0;
@ -858,9 +854,6 @@
{
FT_Error error;
FT_GlyphLoader gloader = loader->gloader;
FT_Outline current_outline = gloader->current.outline;
TT_Set_CodeRange( exec, tt_coderange_glyph, exec->glyphIns, n_ins );
@ -872,7 +865,7 @@
return error;
/* store drop-out mode in bits 5-7; set bit 2 also as a marker */
current_outline.tags[0] |=
loader->gloader->current.outline.tags[0] |=
( exec->GS.scan_type << 5 ) | FT_CURVE_TAG_HAS_SCANMODE;
}
@ -922,10 +915,10 @@
static FT_Error
TT_Process_Simple_Glyph( TT_Loader loader )
{
FT_GlyphLoader gloader = loader->gloader;
FT_Error error = FT_Err_Ok;
FT_Outline* outline;
FT_Int n_points;
FT_Error error = FT_Err_Ok;
FT_GlyphLoader gloader = loader->gloader;
FT_Outline* outline = &gloader->current.outline;
FT_Int n_points = outline->n_points;
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_Memory memory = loader->face->root.memory;
@ -933,11 +926,7 @@
#endif
outline = &gloader->current.outline;
n_points = outline->n_points;
/* set phantom points */
outline->points[n_points ] = loader->pp1;
outline->points[n_points + 1] = loader->pp2;
outline->points[n_points + 2] = loader->pp3;