From 066a49139b904aa1f8a47d3b4fd45c0a1d4c7aca Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 6 Oct 2015 07:55:32 +0200 Subject: [PATCH] [cff] Return correct PS names from pure CFF (#46130). * src/cff/cffdrivr.c (cff_get_ps_name): Use SFNT service only for SFNT. --- ChangeLog | 7 +++++++ src/cff/cffdrivr.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2479af3dd..f167eaeda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-10-06 Werner Lemberg + + [cff] Return correct PS names from pure CFF (#46130). + + * src/cff/cffdrivr.c (cff_get_ps_name): Use SFNT service only for + SFNT. + 2015-10-04 Werner Lemberg [base] Replace left shifts with multiplication (#46118). diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index a718b7a00..6221c0c22 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -444,7 +444,7 @@ /* following the OpenType specification 1.7, we return the name stored */ /* in the `name' table for a CFF wrapped into an SFNT container */ - if ( sfnt ) + if ( FT_IS_SFNT( FT_FACE( face ) ) && sfnt ) { FT_Library library = FT_FACE_LIBRARY( face ); FT_Module sfnt_module = FT_Get_Module( library, "sfnt" );