From 8930cc96188c21a0ea5f7da7a6d00c4fefd86d3a Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 12 Feb 2020 18:25:03 +0100 Subject: [PATCH] * src/sfnt/ttcmap.c (tt_face_build_cmaps): Ignore version (#57708). --- ChangeLog | 4 ++++ src/sfnt/ttcmap.c | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c0c34e69..068d4f942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2020-02-12 Werner Lemberg + + * src/sfnt/ttcmap.c (tt_face_build_cmaps): Ignore version (#57708). + 2020-02-04 Werner Lemberg * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter (#57732). diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index a2ea1fbfa..2c34efb5c 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -3776,14 +3776,16 @@ if ( !p || face->cmap_size < 4 ) return FT_THROW( Invalid_Table ); - /* only recognize format 0 */ - if ( TT_NEXT_USHORT( p ) != 0 ) - { - FT_ERROR(( "tt_face_build_cmaps:" - " unsupported `cmap' table format = %d\n", - TT_PEEK_USHORT( p - 2 ) )); - return FT_THROW( Invalid_Table ); - } + /* Version 1.8.3 of the OpenType specification contains the following */ + /* (https://docs.microsoft.com/en-us/typography/opentype/spec/cmap): */ + /* */ + /* The 'cmap' table version number remains at 0x0000 for fonts that */ + /* make use of the newer subtable formats. */ + /* */ + /* This essentially means that a version format test is useless. */ + + /* ignore format */ + p += 2; num_cmaps = TT_NEXT_USHORT( p ); limit = table + face->cmap_size;