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

fixed a bug which appeared when loading 

unscaled composite glyphs
This commit is contained in:
David Turner 2000-02-28 11:23:36 +00:00
parent 58c10b5a6b
commit 7bb7fedef1
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/truetype/ttgload.c
View File

@ -532,7 +532,8 @@
loader->pp2.x = FT_MulFix( loader->pp2.x, x_scale );
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
loader->exec->glyphSize = 0;
if (loader->exec)
loader->exec->glyphSize = 0;
#endif
goto Load_End;
}
@ -722,7 +723,12 @@
num_base_points = loader->base.n_points;
error = load_truetype_glyph( loader, subglyph->index );
if ((subglyph->flags & USE_MY_METRICS) == 0)
if ( subglyph->flags & USE_MY_METRICS )
{
pp1 = loader->pp1;
pp2 = loader->pp2;
}
else
{
loader->pp1 = pp1;
loader->pp2 = pp2;
@ -818,7 +824,7 @@
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
subglyph--;
if (num_subglyphs > 0 && subglyph->flags & WE_HAVE_INSTR)
if (num_subglyphs > 0 && loader->exec && subglyph->flags & WE_HAVE_INSTR)
{
TT_UShort n_ins;
TT_ExecContext exec = loader->exec;
@ -839,6 +845,9 @@
return TT_Err_Too_Many_Ins;
}
if (exec)
{
}
/* read the instructions */
if ( FILE_Read( exec->glyphIns, n_ins ) )
goto Fail;
@ -1117,7 +1126,8 @@
}
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
glyph->outline.dropout_mode = (TT_Char)loader->exec->GS.scan_type;
if (loader->exec)
glyph->outline.dropout_mode = (TT_Char)loader->exec->GS.scan_type;
#else
glyph->outline.dropout_mode = 2;
#endif

6
src/type1/t1afm.c
View File

@ -108,8 +108,8 @@
/* parse an AFM file - for now, only read the kerning pairs */
LOCAL_FUNC
FT_Error T1_Read_AFM( FT_Stream stream,
FT_Face t1_face )
FT_Error T1_Read_AFM( FT_Face t1_face,
FT_Stream stream )
{
FT_Error error;
FT_Memory memory = stream->memory;
@ -121,7 +121,7 @@
T1_Font* type1 = &((T1_Face)t1_face)->type1;
T1_AFM* afm = 0;
if ( !ACCESS_Frame(stream->size) )
if ( ACCESS_Frame(stream->size) )
return error;
start = (FT_Byte*)stream->cursor;