summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2014-11-22 12:44:33 +0100
committerWerner Lemberg <wl@gnu.org>2014-11-22 12:44:33 +0100
commit42fcd6693ec7bd6ffc65ddc63e74287a65dda669 (patch)
tree1bfb385ac39e075b5a4e90c2c4477e2a0366ed0c
parent3788187e0c396952cd7d905c6c61f3ff8e84b2b4 (diff)
downloadfreetype2-42fcd6693ec7bd6ffc65ddc63e74287a65dda669.tar.gz
[type42] Allow only embedded TrueType fonts.
This is a follow-up to Savannah bug #43659. * src/type42/t42objs.c (T42_Face_Init): Exclusively use the `truetype' font driver for loading the font contained in the `sfnts' array.
-rw-r--r--ChangeLog10
-rw-r--r--src/type42/t42objs.c4
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 91d8bbb..20a79d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2014-11-22 Werner Lemberg <wl@gnu.org>
+ [type42] Allow only embedded TrueType fonts.
+
+ This is a follow-up to Savannah bug #43659.
+
+ * src/type42/t42objs.c (T42_Face_Init): Exclusively use the
+ `truetype' font driver for loading the font contained in the `sfnts'
+ array.
+
+2014-11-22 Werner Lemberg <wl@gnu.org>
+
[type42] Fix Savannah bug #43659.
* src/type42/t42objs.c (T42_Open_Face): Initialize `face->ttf_size'.
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index 7a9cb57..915e81f 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -292,7 +292,9 @@
FT_Open_Args args;
- args.flags = FT_OPEN_MEMORY;
+ args.flags = FT_OPEN_MEMORY | FT_OPEN_DRIVER;
+ args.driver = FT_Get_Module( FT_FACE_LIBRARY( face ),
+ "truetype" );
args.memory_base = face->ttf_data;
args.memory_size = face->ttf_size;