diff options
| author | David Turner <david@freetype.org> | 2006-02-16 22:45:31 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2006-02-16 22:45:31 +0000 |
| commit | cda2d957dc66673ac7d573e72e6aa4c02d407eb2 (patch) | |
| tree | 57ea6e6dfecbb382293c754285e9901abdacea48 /src/bdf | |
| parent | 0d565fdc1d3a383d032a198561be26739a0c55f5 (diff) | |
* builds/amiga/src/base/ftsystem.c, devel/ftoption.h
include/freetype/ftcache.h, include/freetype/ftoutln.h,
include/freetype/cache/ftccache.h, include/freetype/cache/ftccmap.h,
include/freetype/config/ftoption.h, include/freetype/internal/ftcalc.h,
include/freetype/internal/ftdriver.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h, include/freetype/internal/ftrfork.h,
include/freetype/internal/psaux.h, include/freetype/internal/sfnt.h,
include/freetype/internal/t1types.h, include/freetype/internal/tttypes.h,
src/base/ftcalc.c, src/base/ftdbgmem.c, src/base/ftobjs.c,
src/base/ftsystem.c, src/base/ftutil.c, src/bdf/bdfdrivr.c,
src/cache/ftccache.c, src/cache/ftccback.h, src/cache/ftccmap.c,
src/cache/ftcmanag.c, src/cff/cffdrivr.c, src/cid/cidriver.c,
src/pcf/pcfdrivr.c, src/pfr/pfrdrivr.c, src/psaux/psauxmod.c,
src/sfnt/sfdriver.c, src/truetype/ttdriver.c, src/type1/t1driver.c,
src/type1/t1objs.c, src/type42/t42drivr.c, src/winfonts/winfnt.c:
massive changes to the internals to respect the internal object layouts
and exported functions of FreeType 2.1.7. Note that the cache sub-system
cannot be fully retrofitted, unfortunately.
Diffstat (limited to 'src/bdf')
| -rw-r--r-- | src/bdf/bdfdrivr.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 93592f51..39198eb9 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -251,7 +251,7 @@ THE SOFTWARE. { if ( FT_ALLOC( face->style_name, ft_strlen( "Regular" ) + 1 ) ) return error; - + ft_strcpy( face->style_name, "Regular" ); } else @@ -475,7 +475,7 @@ THE SOFTWARE. (face->en_table[n]).enc = cur[n].encoding; FT_TRACE4(( "idx %d, val 0x%lX\n", n, cur[n].encoding )); (face->en_table[n]).glyph = (FT_Short)n; - + if ( cur[n].encoding == font->default_char ) face->default_glyph = n; } @@ -639,6 +639,7 @@ THE SOFTWARE. } + FT_CALLBACK_DEF( FT_Error ) BDF_Glyph_Load( FT_GlyphSlot slot, FT_Size size, @@ -704,7 +705,7 @@ THE SOFTWARE. slot->metrics.width = bitmap->width << 6; slot->metrics.height = bitmap->rows << 6; - /* + /* * XXX DWIDTH1 and VVECTOR should be parsed and * used here, provided such fonts do exist. */ @@ -837,14 +838,18 @@ THE SOFTWARE. 0, /* FT_Slot_InitFunc */ 0, /* FT_Slot_DoneFunc */ - BDF_Size_Request, - BDF_Size_Select, - +#ifdef FT_CONFIG_OPTION_OLD_INTERNALS + ft_stub_set_char_sizes, + ft_stub_set_pixel_sizes, +#endif BDF_Glyph_Load, 0, /* FT_Face_GetKerningFunc */ 0, /* FT_Face_AttachFunc */ 0, /* FT_Face_GetAdvancesFunc */ + + BDF_Size_Request, + BDF_Size_Select }; |