From a4df0373c71f426711fb77e3a21d4b58b7c42e66 Mon Sep 17 00:00:00 2001 From: Nikhil Ramakrishnan Date: Tue, 31 Dec 2019 16:04:01 +0100 Subject: [PATCH] [woff2] Allow bitmap-only fonts (#57394). * src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and `loca' tables. --- ChangeLog | 7 +++++++ src/sfnt/sfwoff2.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76295733e..5447fc4fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-12-31 Nikhil Ramakrishnan + + [woff2] Allow bitmap-only fonts (#57394). + + * src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and + `loca' tables. + 2019-12-21 Hugh McMaster [docs] (2/2) Fix generation of API documentation (#56745). diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c index 3134ccd53..36ae6e703 100644 --- a/src/sfnt/sfwoff2.c +++ b/src/sfnt/sfwoff2.c @@ -1513,9 +1513,9 @@ info->glyf_table = find_table( indices, num_tables, TTAG_glyf ); info->loca_table = find_table( indices, num_tables, TTAG_loca ); - if ( !( info->glyf_table && info->loca_table ) ) + if ( ( info->glyf_table == NULL ) ^ ( info->loca_table == NULL ) ) { - FT_ERROR(( "Both `glyph' and `loca' tables must be present.\n" )); + FT_ERROR(( "One of `glyf'/`loca' tables missing.\n" )); return FT_THROW( Invalid_Table ); }