rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/pfr/pfrgload.c (pfr_glyph_curve_to, pfr_glyph_line_to): Convert 

assertion into normal FreeType error.
This commit is contained in:
Werner Lemberg 2007-06-05 05:50:01 +00:00
parent 6c05475d50
commit 9a0332cd3f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,8 +4,8 @@
(pfr_glyph_load_simple): Convert assertion into normal FreeType
error.
Check `idx'.
(pfr_glyph_load_compound): Convert assertion into normal FreeType
error.
(pfr_glyph_load_compound, pfr_glyph_curve_to, pfr_glyph_line_to):
Convert assertion into normal FreeType error.
* src/pfr/pfrtypes.h (PFR_GlyphRec): Comment out unused code.

16
src/pfr/pfrgload.c
View File

@ -133,7 +133,12 @@
/* check that we have begun a new path */
FT_ASSERT( glyph->path_begun != 0 );
if ( !glyph->path_begun )
{
error = PFR_Err_Invalid_Table;
FT_ERROR(( "pfr_glyph_line_to: invalid glyph data\n" ));
goto Exit;
}
error = FT_GLYPHLOADER_CHECK_POINTS( loader, 1, 0 );
if ( !error )
@ -147,6 +152,7 @@
outline->n_points++;
}
Exit:
return error;
}
@ -163,7 +169,12 @@
/* check that we have begun a new path */
FT_ASSERT( glyph->path_begun != 0 );
if ( !glyph->path_begun )
{
error = PFR_Err_Invalid_Table;
FT_ERROR(( "pfr_glyph_line_to: invalid glyph data\n" ));
goto Exit;
}
error = FT_GLYPHLOADER_CHECK_POINTS( loader, 3, 0 );
if ( !error )
@ -182,6 +193,7 @@
outline->n_points = (FT_Short)( outline->n_points + 3 );
}
Exit:
return error;
}