[sfnt] Load pure CFF fonts wrapped in SFNT container.
Such fonts only have a `cmap' and a `CFF' table. * src/sfnt/ttload.c (tt_face_load_font_dir): Don't call `check_table_dir' if font signature is `OTTO'.
This commit is contained in:
parent
eaf0afb4c7
commit
1e1688340e
|
@ -1,3 +1,12 @@
|
||||||
|
2012-10-20 Andreas Pehnack <andreas.pehnack@me.com>
|
||||||
|
|
||||||
|
[sfnt] Load pure CFF fonts wrapped in SFNT container.
|
||||||
|
|
||||||
|
Such fonts only have a `cmap' and a `CFF' table.
|
||||||
|
|
||||||
|
* src/sfnt/ttload.c (tt_face_load_font_dir): Don't call
|
||||||
|
`check_table_dir' if font signature is `OTTO'.
|
||||||
|
|
||||||
2012-10-20 Werner Lemberg <wl@gnu.org>
|
2012-10-20 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[psaux] Fix some value overflows and improve tracing.
|
[psaux] Fix some value overflows and improve tracing.
|
||||||
|
|
|
@ -361,14 +361,17 @@
|
||||||
FT_TRACE2(( "-- Number of tables: %10u\n", sfnt.num_tables ));
|
FT_TRACE2(( "-- Number of tables: %10u\n", sfnt.num_tables ));
|
||||||
FT_TRACE2(( "-- Format version: 0x%08lx\n", sfnt.format_tag ));
|
FT_TRACE2(( "-- Format version: 0x%08lx\n", sfnt.format_tag ));
|
||||||
|
|
||||||
/* check first */
|
if ( sfnt.format_tag != TTAG_OTTO )
|
||||||
error = check_table_dir( &sfnt, stream );
|
|
||||||
if ( error )
|
|
||||||
{
|
{
|
||||||
FT_TRACE2(( "tt_face_load_font_dir:"
|
/* check first */
|
||||||
" invalid table directory for TrueType\n" ));
|
error = check_table_dir( &sfnt, stream );
|
||||||
|
if ( error )
|
||||||
|
{
|
||||||
|
FT_TRACE2(( "tt_face_load_font_dir:"
|
||||||
|
" invalid table directory for TrueType\n" ));
|
||||||
|
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
face->num_tables = sfnt.num_tables;
|
face->num_tables = sfnt.num_tables;
|
||||||
|
|
Loading…
Reference in New Issue