commit f61f49fef7a958830be54ffbed801c1bfd18a0be
author John Tytgat <John.Tytgat@esko.com> Fri Jan 18 13:25:23 2019 +0100
committer Werner Lemberg <wl@gnu.org> Fri Jan 18 13:25:23 2019 +0100
tree 0d473002b1b348f9b5da77f2c2f0a62f2386cdd5
parent 1e7a8f30c231bace001c617099e78f78743dd3b4

[sfnt] Handle TT fonts having two PostScript font names (#55471).

* src/sfnt/sfdriver.c (sfnt_get_name_id): Prefer English over any
other language found for PostScript font names.

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index df39ba6..5cd2480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-18  John Tytgat  <John.Tytgat@esko.com>
+
+	[sfnt] Handle TT fonts having two PostScript font names (#55471).
+
+	* src/sfnt/sfdriver.c (sfnt_get_name_id): Prefer English over any
+	other language found for PostScript font names.
+
 2019-01-08  Chris Liddell <chris.liddell@artifex.com>
 
 	[psaux] Fix closepath (#55414).

src/sfnt/sfdriver.c

diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index a15560e..0c3c762 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -608,10 +608,10 @@
 
       if ( name->nameID == id && name->stringLength > 0 )
       {
-        if ( IS_WIN( name ) )
+        if ( IS_WIN( name ) && ( name->languageID == 0x409 || *win == -1 ) )
           *win = n;
 
-        if ( IS_APPLE( name ) )
+        if ( IS_APPLE( name ) && ( name->languageID == 0 || *apple == -1 ) )
           *apple = n;
       }
     }