diff options
author | Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> | 2019-12-31 16:04:01 +0100 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2019-12-31 16:04:01 +0100 |
commit | a4df0373c71f426711fb77e3a21d4b58b7c42e66 (patch) | |
tree | aff1a86be86c3372ece2838a3dea01639651ef52 | |
parent | 496601e5045bb9af24be4819646700a503ce103a (diff) | |
download | freetype2-a4df0373c71f426711fb77e3a21d4b58b7c42e66.tar.gz |
[woff2] Allow bitmap-only fonts (#57394).
* src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and
`loca' tables.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | src/sfnt/sfwoff2.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2019-12-31 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> + + [woff2] Allow bitmap-only fonts (#57394). + + * src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and + `loca' tables. + 2019-12-21 Hugh McMaster <hugh.mcmaster@outlook.com> [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 ); } |