minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/sfnt/sfobjc.c (sfnt_init_face): Move tag check to... 

* src/sfnt/ttload.c (sfnt_init): Here, before handling TTCs.
This commit is contained in:
Werner Lemberg 2005-12-07 20:34:11 +00:00
parent 3b8db66941
commit 364db0826b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-12-07 Werner Lemberg <wl@gnu.org>
* src/sfnt/sfobjc.c (sfnt_init_face): Move tag check to...
* src/sfnt/ttload.c (sfnt_init): Here, before handling TTCs.
2005-12-06 Chia-I Wu <b90201047@ntu.edu.tw>
* src/truetype/ttobjs.c (tt_size_init): size->ttmetrics.valid is

7
src/sfnt/sfobjs.c
View File

@ -376,13 +376,6 @@
if ( error )
goto Exit;
if ( sfnt_header.format_tag != 0x00010000UL &&
sfnt_header.format_tag != TTAG_ttcf &&
sfnt_header.format_tag != FT_MAKE_TAG( 'O', 'T', 'T', 'O' ) &&
sfnt_header.format_tag != TTAG_true &&
sfnt_header.format_tag != 0x00020000UL )
return SFNT_Err_Unknown_File_Format;
face->format_tag = sfnt_header.format_tag;
face->num_tables = sfnt_header.num_tables;

7
src/sfnt/ttload.c
View File

@ -266,6 +266,13 @@
if ( FT_READ_ULONG( tag ) )
return error;
if ( tag != 0x00010000UL &&
tag != TTAG_ttcf &&
tag != FT_MAKE_TAG( 'O', 'T', 'T', 'O' ) &&
tag != TTAG_true &&
tag != 0x00020000UL )
return SFNT_Err_Unknown_File_Format;
face->ttc_header.tag = TTAG_ttcf;
if ( tag == TTAG_ttcf )