* src/truetype/ttgload.c (TT_Load_Glyph): Allow size->ttmetrics to be

invalid when FT_LOAD_NO_SCALE is set.
This commit is contained in:
Wu, Chia-I (吳佳一) 2005-10-19 08:07:38 +00:00
parent 8e6c56f99e
commit 2293bb15c2
2 changed files with 17 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2005-10-19 Chia-I Wu <b90201047@ntu.edu.tw>
* src/truetype/ttgload.c (TT_Load_Glyph): Allow size->ttmetrics to be
invalid when FT_LOAD_NO_SCALE is set.
2005-10-17 David Turner <david@freetype.org>
* src/base/ftobjs.c (FT_Open_Face): Don't call FT_New_GlyphSlot and

View File

@ -2020,7 +2020,8 @@
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
if ( !size->ttmetrics.valid )
/* if FT_LOAD_NO_SCALE is not set, ttmetirc must be valid */
if ( !( load_flags & FT_LOAD_NO_SCALE ) && !size->ttmetrics.valid )
return TT_Err_Invalid_Size_Handle;
if ( load_flags & FT_LOAD_SBITS_ONLY )
@ -2061,7 +2062,7 @@
/* This is _critical_ to get correct output for monochrome */
/* TrueType glyphs at all sizes using the bytecode interpreter. */
/* */
if ( size->root.metrics.y_ppem < 24 )
if ( !( load_flags & FT_LOAD_NO_SCALE ) && size->root.metrics.y_ppem < 24 )
glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
return error;