[sfnt] Prefer `CBDT'/`CBLC' over `glyf' table (#53154).

This commit is contained in:
Werner Lemberg 2018-02-17 18:35:15 +01:00
parent 9fbd0041ca
commit 713d68ee9f
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,7 @@
2018-02-17 Werner Lemberg <wl@gnu.org>
[sfnt] Prefer `CBDT'/`CBLC' over `glyf' table (#53154).
2018-02-06 Werner Lemberg <wl@gnu.org>
[truetype] Integer overflow issues.

View File

@ -1144,6 +1144,8 @@
FT_Bool has_outline;
FT_Bool is_apple_sbit;
FT_Bool is_apple_sbix;
FT_Bool has_CBLC;
FT_Bool has_CBDT;
FT_Bool ignore_typographic_family = FALSE;
FT_Bool ignore_typographic_subfamily = FALSE;
@ -1224,6 +1226,13 @@
goto Exit;
}
has_CBLC = !face->goto_table( face, TTAG_CBLC, stream, 0 );
has_CBDT = !face->goto_table( face, TTAG_CBDT, stream, 0 );
/* Ignore outlines for CBLC/CBDT fonts. */
if ( has_CBLC || has_CBDT )
has_outline = FALSE;
/* OpenType 1.8.2 introduced limits to this value; */
/* however, they make sense for older SFNT fonts also */
if ( face->header.Units_Per_EM < 16 ||