From c4be026e7748091f1dbeecdcf7165ab5501e62e4 Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Sat, 25 Nov 2006 21:45:06 +0000 Subject: [PATCH] * Source/art/ftfont.m (appendBezierPathWithGlyphs:count:toPath:): Uncomment code and switch to using FTC_Manager_LookupSize. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24163 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/art/ftfont.m | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66f06d2..00fd8ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-11-25 Matt Rice + + * Source/art/ftfont.m (appendBezierPathWithGlyphs:count:toPath:): + Uncomment code and switch to using FTC_Manager_LookupSize. + 2006-11-19 Richard Frith-Macdonald * Source/winlib/WIN32GState.m: diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m index 6155486..9d86814 100644 --- a/Source/art/ftfont.m +++ b/Source/art/ftfont.m @@ -2571,7 +2571,6 @@ add code to avoid loading bitmaps for glyphs */ count: (int)count toBezierPath: (NSBezierPath *)path { -#if 0 int i; NSGlyph glyph; @@ -2592,11 +2591,15 @@ add code to avoid loading bitmaps for glyphs */ FT_Face face; FT_Glyph gl; FT_OutlineGlyph og; + FT_Size size; glyph = *glyphs - 1; - if (FTC_Manager_Lookup_Size(ftc_manager, &imgd.font, &face, 0)) + if (FTC_Manager_LookupSize(ftc_manager, &scaler, &size)) continue; + + face = size->face; + if (FT_Load_Glyph(face, glyph, FT_LOAD_DEFAULT)) continue; @@ -2622,7 +2625,6 @@ add code to avoid loading bitmaps for glyphs */ { [path moveToPoint: NSMakePoint(ftdelta.x / 64.0, ftdelta.y / 64.0)]; } -#endif }