[tfm] Fixes.

Conflicts: include/freetype/internal/tfm.h
7 years ago · 75fd199d70
parent 46ab8e2f4c
commit 75fd199d70
2 changed files with 2 additions and 1 deletions
--- a/include/freetype/internal/tfm.h
+++ b/include/freetype/internal/tfm.h
@ -48,7 +48,7 @@ FT_BEGIN_HEADER
    /* Font Info */
    FT_ULong       cs;
    /* Metrics */
-    FT_ULong       ds;
+    FT_ULong       ds, fs; /* Design Size */
    FT_UInt        design_size;
    FT_UInt        slant;
    FT_UInt        begin_char, end_char;
--- a/src/tfm/tfmobjs.c
+++ b/src/tfm/tfmobjs.c
@ -167,6 +167,7 @@
      return error;

    lf = (FT_ULong)READ_UINT2( stream );
+    fi->fs = 4*lf - 1 ;

    #if 0
    if ((lf == 11) || (lf == 9))