diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-26 20:09:05 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-26 20:09:05 +0000 |
| commit | e95c1b3e30da583b0f011c1fd130de2d54d7d910 (patch) | |
| tree | 806c06bc4f41ba6dd5ca379f1430fe2bf3ffc051 | |
| parent | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (diff) | |
65. Enabling Chisato's optimatization for freetype2 when fonts contain bothxo-6_7_0XORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0
bitmapped and outline glyphs when the internal version of freetype2 is
used. This should be replaced with a solution which doesn't require to
use an internal API. (Egbert Eich).
| -rw-r--r-- | src/FreeType/ftfuncs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index dc58b2c..f47e03a 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -52,6 +52,9 @@ THE SOFTWARE. #include FT_XFREE86_H #include FT_BBOX_H #include FT_INTERNAL_TRUETYPE_TYPES_H +#ifdef USE_INTERNAL_FREETYPE +# include "ttobjs.h" +#endif /* * If you want to use FT_Outline_Get_CBox instead of @@ -907,8 +910,14 @@ FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, /* If sbit is available, we don't use very lazy method. */ /* See TT_Load_Glyph */ if( FT_IS_SFNT( face->face ) ) { +#ifdef USE_INTERNAL_FREETYPE + TT_Size tt_size = (TT_Size)instance->size; + if( !( !(instance->load_flags & FT_LOAD_NO_BITMAP) + && tt_size->strike_index != 0xFFFFU ) ) +#else if((instance->load_flags & FT_LOAD_NO_BITMAP) || (face->face->face_flags & FT_FACE_FLAG_FIXED_SIZES) == 0) +#endif correct=1; } } |