diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:08 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-10 09:04:08 +0000 |
| commit | d3d6948e7f709b9101330b521a02a808604c6804 (patch) | |
| tree | d5f4330e8ccc4db2da8b767e4db9770988225e61 | |
| parent | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (diff) | |
Resync to 2004-04-10 XORG-RELEASE-1 branch
| -rw-r--r-- | src/FreeType/ftfuncs.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c index dc58b2c..a7f2f4c 100644 --- a/src/FreeType/ftfuncs.c +++ b/src/FreeType/ftfuncs.c @@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg$ */ +/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.1.4.4.2.3 2004/03/26 20:09:05 eich Exp $ */ /* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ @@ -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; } } |