[freetype2] master 1897186 3/3: * src/cid/cidtoken.h: Handle `XUID' keyword.

[Werner LEMBERG]

branch: master
commit 1897186fb718bdda9f953c09906cb5bf36594905
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/cid/cidtoken.h: Handle `XUID' keyword.
---
 ChangeLog          |  4 ++++
 src/cid/cidtoken.h | 25 ++++++++++++++-----------
 src/type1/t1load.c |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e53fb6..a031a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2018-07-31  Werner Lemberg  <address@hidden>
 
+       * src/cid/cidtoken.h: Handle `XUID' keyword.
+
+2018-07-31  Werner Lemberg  <address@hidden>
+
        [cid] Trace PostScript dictionaries.
 
        * src/cid/cidload.c: Include FT_INTERNAL_POSTSCRIPT_AUX_H
diff --git a/src/cid/cidtoken.h b/src/cid/cidtoken.h
index 11883b1..d957e5a 100644
--- a/src/cid/cidtoken.h
+++ b/src/cid/cidtoken.h
@@ -21,17 +21,20 @@
 #undef  T1CODE
 #define T1CODE        T1_FIELD_LOCATION_CID_INFO
 
-  T1_FIELD_KEY   ( "CIDFontName",    cid_font_name, 0 )
-  T1_FIELD_FIXED ( "CIDFontVersion", cid_version,   0 )
-  T1_FIELD_NUM   ( "CIDFontType",    cid_font_type, 0 )
-  T1_FIELD_STRING( "Registry",       registry,      0 )
-  T1_FIELD_STRING( "Ordering",       ordering,      0 )
-  T1_FIELD_NUM   ( "Supplement",     supplement,    0 )
-  T1_FIELD_NUM   ( "UIDBase",        uid_base,      0 )
-  T1_FIELD_NUM   ( "CIDMapOffset",   cidmap_offset, 0 )
-  T1_FIELD_NUM   ( "FDBytes",        fd_bytes,      0 )
-  T1_FIELD_NUM   ( "GDBytes",        gd_bytes,      0 )
-  T1_FIELD_NUM   ( "CIDCount",       cid_count,     0 )
+  T1_FIELD_KEY      ( "CIDFontName",    cid_font_name, 0 )
+  T1_FIELD_FIXED    ( "CIDFontVersion", cid_version,   0 )
+  T1_FIELD_NUM      ( "CIDFontType",    cid_font_type, 0 )
+  T1_FIELD_STRING   ( "Registry",       registry,      0 )
+  T1_FIELD_STRING   ( "Ordering",       ordering,      0 )
+  T1_FIELD_NUM      ( "Supplement",     supplement,    0 )
+  T1_FIELD_NUM      ( "UIDBase",        uid_base,      0 )
+
+  T1_FIELD_NUM_TABLE( "XUID",           xuid,          16, 0 )
+
+  T1_FIELD_NUM      ( "CIDMapOffset",   cidmap_offset, 0 )
+  T1_FIELD_NUM      ( "FDBytes",        fd_bytes,      0 )
+  T1_FIELD_NUM      ( "GDBytes",        gd_bytes,      0 )
+  T1_FIELD_NUM      ( "CIDCount",       cid_count,     0 )
 
 
 #undef  FT_STRUCTURE
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 3e67223..627d8d2 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -1308,7 +1308,7 @@
                 (double)temp[2] / 65536 / 1000,
                 (double)temp[3] / 65536 / 1000,
                 (double)temp[4] / 65536 / 1000,
-                (double)temp[5] / 65536 / 1000));
+                (double)temp[5] / 65536 / 1000 ));
 
     temp_scale = FT_ABS( temp[3] );