[freetype2] master 066a491: [cff] Return correct PS names from pure CFF (#46130).

[Werner LEMBERG]

branch: master
commit 066a49139b904aa1f8a47d3b4fd45c0a1d4c7aca
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2479af3..f167eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-06  Werner Lemberg  <address@hidden>
+
+       [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  <address@hidden>
 
        [base] Replace left shifts with multiplication (#46118).
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index a718b7a..6221c0c 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" );