shithub: freetype+ttf2subf

Download patch

ref: a4df0373c71f426711fb77e3a21d4b58b7c42e66
parent: 496601e5045bb9af24be4819646700a503ce103a
author: Nikhil Ramakrishnan <[email protected]>
date: Tue Dec 31 11:04:01 EST 2019 

[woff2] Allow bitmap-only fonts (#57394).

* src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and
`loca' tables.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-31  Nikhil Ramakrishnan  <[email protected]>
+
+	[woff2] Allow bitmap-only fonts (#57394).
+
+	* src/sfnt/sfwoff2.c (reconstruct_font): Fix test for `glyf' and
+	`loca' tables.
+
 2019-12-21  Hugh McMaster  <[email protected]>
 
 	[docs] (2/2) Fix generation of API documentation (#56745).
--- 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 );
     }