summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParth Wazurkar <parthwazurkar@gmail.com>2018-08-02 00:55:08 +0530
committerParth Wazurkar <parthwazurkar@gmail.com>2018-12-20 23:29:42 +0530
commit75fd199d708b29af35ce74d98826e9242dbaf4e7 (patch)
treef3e397ec269d7ce4a71169af7894cad058c03c2e
parent46ab8e2f4c5f1441eac3f9ede9c7b7af8e500408 (diff)
downloadfreetype2-75fd199d708b29af35ce74d98826e9242dbaf4e7.tar.gz
[tfm] Fixes.
Conflicts: include/freetype/internal/tfm.h
-rw-r--r--include/freetype/internal/tfm.h2
-rw-r--r--src/tfm/tfmobjs.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/freetype/internal/tfm.h b/include/freetype/internal/tfm.h
index 7289e6795..6478344d5 100644
--- 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;
diff --git a/src/tfm/tfmobjs.c b/src/tfm/tfmobjs.c
index 69ec22e16..35c8ff4af 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))