ref: caf4be3cd12c0dd2736097957e7d03555939a6ce
parent: c528f6fa4100c13a662e2d2a6d6951e24daf14cf
author: David Turner <[email protected]>
date: Wed Dec 18 17:53:12 EST 2002
* src/winfonts/winfnt.c: included George Williams' fix to support
version 2 fonts correctly
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
* src/base/ftobjs.c (open_face): included Graham Asher's fix to
prevent faces without Unicode charmaps from loading
+ * src/winfonts/winfnt.c: included George Williams' fix to support
+ version 2 fonts correctly
+
2002-12-16 David Turner <[email protected]>
* docs/VERSION.DLL: updating document to better explain the differences between
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -70,7 +70,7 @@
#undef FT_STRUCTURE
#define FT_STRUCTURE WinFNT_HeaderRec
- FT_FRAME_START( 134 ),
+ FT_FRAME_START( 146 ),
FT_FRAME_USHORT_LE( version ),
FT_FRAME_ULONG_LE ( file_size ),
FT_FRAME_BYTES ( copyright, 60 ),
@@ -106,7 +106,7 @@
FT_FRAME_USHORT_LE( B_space ),
FT_FRAME_USHORT_LE( C_space ),
FT_FRAME_USHORT_LE( color_table_offset ),
- FT_FRAME_BYTES ( reserved, 4 ),
+ FT_FRAME_BYTES ( reserved, 16 ),
FT_FRAME_END
};
@@ -145,6 +145,17 @@
goto Exit;
}
+ /* Version 2 doesn't have these fields */
+ if ( header->version == 0x200 )
+ {+ header->flags = 0;
+ header->A_space = 0;
+ header->B_space = 0;
+ header->C_space = 0;
+
+ header->color_table_offset = 0;
+ }
+
if ( header->file_type & 1 )
{FT_TRACE2(( "[can't handle vector FNT fonts]\n" ));
@@ -592,7 +603,7 @@
len = new_format ? 6 : 4;
/* jump to glyph entry */
- p = font->fnt_frame + 118 + len * glyph_index;
+ p = font->fnt_frame + ( new_format ? 146 : 118 ) + len * glyph_index;
bitmap->width = FT_NEXT_SHORT_LE( p );