diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:05 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-29 12:18:05 +0000 |
| commit | 6ac13575c01f51a9645d1cb3e43ba6ca573dca98 (patch) | |
| tree | cf4ea613eca00ec9e4aefe9eac2aab769fe60712 | |
| parent | 2a71d12399e42aca423cef951ba2e40aaea5134b (diff) | |
merge with XORG-RELEASE-1CYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
| -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 77140a4..9c7d17e 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; } } |