From 75fd199d708b29af35ce74d98826e9242dbaf4e7 Mon Sep 17 00:00:00 2001 From: Parth Wazurkar Date: Thu, 2 Aug 2018 00:55:08 +0530 Subject: [PATCH] [tfm] Fixes. Conflicts: include/freetype/internal/tfm.h --- include/freetype/internal/tfm.h | 2 +- src/tfm/tfmobjs.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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))