[tfm] Fixes.

Conflicts:
	include/freetype/internal/tfm.h
diff --git a/include/freetype/internal/tfm.h b/include/freetype/internal/tfm.h
index 7289e67..6478344 100644
--- a/include/freetype/internal/tfm.h
+++ b/include/freetype/internal/tfm.h
@@ -48,7 +48,7 @@
     /* 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;
diff --git a/src/tfm/tfmobjs.c b/src/tfm/tfmobjs.c
index 69ec22e..35c8ff4 100644
--- 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))