Commit 57ce0bee449bfc6fa418f1492ef23cb4baeb7c95

David Turner 2003-01-08T10:06:19

* src/winfonts/winfnt.c: read 16 bytes into "reserved2", not "reserved"

diff --git a/ChangeLog b/ChangeLog
index 3811137..1ee3271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-08  Huw Dawies  <huw@codeweavers.com>
+
+        * src/winfonts/winfnt.c: read 16 bytes into "reserved2", not "reserved"
+
+        * src/base/ftobjs.c (find_unicode_charmap): fixed the error code
+        returned when the font doesn't contain a Unicode charmap. This
+        allows FT2 to load "symbol.ttf" and a few others correctly since
+        the last release
+
+
 2003-01-08  Owen Taylor  <owen@redhat.com>
 
         * src/autohint/ahtypes.h, src/autohint/ahhint.c, src/pshinter/pshalgo3.h,
@@ -9,11 +19,6 @@
 
 2003-01-08  David Turner  <david@freetype.org>
 
-        * src/base/ftobjs.c (find_unicode_charmap): fixed the error code
-        returned when the font doesn't contain a Unicode charmap. This
-        allows FT2 to load "symbol.ttf" and a few others correctly since
-        the last release
-
         * Jamrules, Jamfile, Jamfile.in, src/*/Jamfile: small changes to
         support the compilation of FreeType 2 as part of larger projects with
         their own configuration options (only with Jam)
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 7040648..9d29b9b 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -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, 16 ),
+      FT_FRAME_BYTES    ( reserved2, 16 ),
     FT_FRAME_END
   };